1 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 5609314..c19474c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,11 @@
 CMakeFiles
+<<<<<<< HEAD
+*.sh
+2P11
+=======
 *.a
 *.o
+>>>>>>> develop
 cmake_install.cmake
 Makefile
 CMakeCache.txt