summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authormanzerbredes <loic.guegan_secondary@yahoo.fr>2015-05-02 23:06:59 +0200
committermanzerbredes <loic.guegan_secondary@yahoo.fr>2015-05-02 23:06:59 +0200
commit9759972f351bd68001735419bcfb9a285c68bed7 (patch)
treeeb1214bba0632889c2be5fbfc2ed49d944013865 /.gitignore
parent710cc4001f65ac2fee39e25d79f43a01b9e12512 (diff)
Edit gitignore
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore5
1 files changed, 0 insertions, 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