Sorry, forgot diff stuff :)

danielkutik · danielkutik · commit 5df0d1bf2ac6 · 2013-11-09T13:51:09.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,6 @@
 
 # Java class files
 *.class
-<<<<<<< HEAD
 classes/
 
 # generated files
