You can not select more than 25 topics
			Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
		
		
		
		
		
			
		
			
				
					
					
						
							39 lines
						
					
					
						
							585 B
						
					
					
				
			
		
		
	
	
							39 lines
						
					
					
						
							585 B
						
					
					
				<<<<<<< HEAD
 | 
						|
*.iml
 | 
						|
.gradle
 | 
						|
/local.properties
 | 
						|
/.idea/workspace.xml
 | 
						|
/.idea/libraries
 | 
						|
.DS_Store
 | 
						|
/build
 | 
						|
/captures
 | 
						|
.externalNativeBuild
 | 
						|
=======
 | 
						|
>>>>>>> eee131cea39d27218fc7d1c3d641d617d377af42
 | 
						|
# Compiled class file
 | 
						|
*.class
 | 
						|
 | 
						|
# Log file
 | 
						|
*.log
 | 
						|
 | 
						|
# BlueJ files
 | 
						|
*.ctxt
 | 
						|
 | 
						|
# Mobile Tools for Java (J2ME)
 | 
						|
.mtj.tmp/
 | 
						|
 | 
						|
# Package Files #
 | 
						|
*.jar
 | 
						|
*.war
 | 
						|
*.nar
 | 
						|
*.ear
 | 
						|
*.zip
 | 
						|
*.tar.gz
 | 
						|
*.rar
 | 
						|
 | 
						|
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 | 
						|
hs_err_pid*
 | 
						|
<<<<<<< HEAD
 | 
						|
>>>>>>> 2c33f0b33a0411efd93a4810de5061a473835ff5
 | 
						|
=======
 | 
						|
>>>>>>> eee131cea39d27218fc7d1c3d641d617d377af42
 | 
						|
 |