1 files changed, 0 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index 128efc2..2f97c2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,6 @@
 bin/
 .project
 .vscode/
-<<<<<<< HEAD
 build/
-=======
 *.o
 /lib/lib
->>>>>>> caeaf2b26983e18245146d2368c5718f08a21729