7 年之前 · c588a45160
--- a/.gitignore.bak
+++ b/.gitignore.bak
@@ -1,11 +0,0 @@
 
				-/o2cloud/
			
 
				-/.settings/
			
 
				-.classpath
			
 
				-.project
			
 
				-/.settings/
			
 
				-/target/
			
 
				-<<<<<<< HEAD
			
 
				-=======
			
 
				-*_.java
			
 
				->>>>>>> upstream/master
			
 
				-/.svn/