Conflicts: .gitignore target/m2e-wtp/web-resources/META-INF/maven/osc.git.eh3/useful-code/pom.properties
		
			
				
	
	
		
			6 lines
		
	
	
		
			44 B
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			6 lines
		
	
	
		
			44 B
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
*.class
 | 
						|
 | 
						|
# Package Files #
 | 
						|
*.jar
 | 
						|
*.war
 | 
						|
*.ear |