turtlebasket
/
openGJK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove merge resolution output from .gitignore

fixes-turtlebasket
michael 2023-06-13 13:57:53 -07:00
parent cdc4efde80
commit 56f9a8db32
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitignore vendored
View File

@ -2,10 +2,7 @@
build*/* build*/*
*.so *.so
public/ public/
<<<<<<< HEAD
*.exe *.exe
=======
>>>>>>> master
# Eclispe setting --- do not ignore *.cproject and *.project # Eclispe setting --- do not ignore *.cproject and *.project
*/**/.settings */**/.settings
@ -237,8 +234,4 @@ callgrind.out.*
.cache .cache
.pytest_cache .pytest_cache
.mypy_cache .mypy_cache
<<<<<<< HEAD
=======
=======
>>>>>>> master
>>>>>>> cmakeWin