From 9759972f351bd68001735419bcfb9a285c68bed7 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sat, 2 May 2015 23:06:59 +0200
Subject: [PATCH] Edit gitignore

---
 .gitignore | 5 -----
 1 file changed, 5 deletions(-)

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