| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768 | 
							- <<<<<<< HEAD
 
- target
 
- *.iml
 
- =======
 
- >>>>>>> vw/develop
 
- .classpath
 
- .project
 
- .settings
 
- #java
 
- *.class
 
- # Mobile Tools for Java (J2ME)
 
- .mtj.tmp/
 
- # Package Files #
 
- *.jar
 
- *.war
 
- *.ear
 
- # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 
- hs_err_pid*
 
- #eclipse
 
- *.pydevproject
 
- .metadata
 
- .gradle
 
- bin/
 
- tmp/
 
- *.tmp
 
- *.bak
 
- *.swp
 
- *~.nib
 
- local.properties
 
- .settings/
 
- .loadpath
 
- #log
 
- *.log
 
- # External tool builders
 
- .externalToolBuilders/
 
- # Locally stored "Eclipse launch configurations"
 
- *.launch
 
- # CDT-specific
 
- .cproject
 
- # PDT-specific
 
- .buildpath
 
- # sbteclipse plugin 
 
- .target
 
- # TeXlipse plugin
 
- .texlipse
 
- target
 
- <<<<<<< HEAD
 
- # Intellij
 
- *.idea
 
- =======
 
- #Intellij
 
- .idea
 
- >>>>>>> vw/develop
 
- *.iml
 
 
  |