@@ -1,11 +0,0 @@
-/o2cloud/
-/.settings/
-.classpath
-.project
-/target/
-<<<<<<< HEAD
-=======
-*_.java
->>>>>>> upstream/master
-/.svn/