1 files changed, 9 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index ab510cc..c19474c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,15 @@
 CMakeFiles
+<<<<<<< HEAD
 *.sh
 2P11
+=======
+*.a
+*.o
+>>>>>>> develop
 cmake_install.cmake
 Makefile
 CMakeCache.txt
+*.app
+2P11
+clear.sh
+*.vim