Edit gitignore
This commit is contained in:
parent
710cc4001f
commit
9759972f35
1 changed files with 0 additions and 5 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
@ -1,15 +1,10 @@
|
||||||
CMakeFiles
|
CMakeFiles
|
||||||
<<<<<<< HEAD
|
|
||||||
*.sh
|
*.sh
|
||||||
2P11
|
|
||||||
=======
|
|
||||||
*.a
|
*.a
|
||||||
*.o
|
*.o
|
||||||
>>>>>>> develop
|
|
||||||
cmake_install.cmake
|
cmake_install.cmake
|
||||||
Makefile
|
Makefile
|
||||||
CMakeCache.txt
|
CMakeCache.txt
|
||||||
*.app
|
*.app
|
||||||
2P11
|
2P11
|
||||||
clear.sh
|
|
||||||
*.vim
|
*.vim
|
||||||
|
|
Loading…
Add table
Reference in a new issue