diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index a862216..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,4 +0,0 @@
-<<<<<<< HEAD
-=======
-
->>>>>>> 1e311c157dd49b2081dd370e72ebf39d197ff14b