diff --git a/.gitignore b/.gitignore
index 826a6d7..ac343bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 **/bin/
 **/*.kdev4
+=======
+**/.git/
+>>>>>>> 04d78ae (.)