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

remove another merge msg from gitignore

fixes-turtlebasket
michael 2023-06-14 13:53:23 -07:00
parent c58f582f79
commit 73cfe1e1cd
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.gitignore vendored
View File

@ -92,11 +92,7 @@ DocProject/Help/Html2
DocProject/Help/html DocProject/Help/html
# Cmake, make and compiled objects on unix # Cmake, make and compiled objects on unix
<<<<<<< HEAD
#*.cmake #*.cmake
=======
*.cmake
>>>>>>> master
*.c.o *.c.o
*/CMakeFiles/* */CMakeFiles/*
*/Makefile */Makefile
@ -146,20 +142,6 @@ Assets/AssetStoreTools*
# Visual Studio cache directory # Visual Studio cache directory
.vs/ .vs/
<<<<<<< HEAD
=======
# Visual Studio Code cache directory
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
*.code-workspace
# Local History for Visual Studio Code
.history/
>>>>>>> master
# Autogenerated VS/MD/Consulo solution and project files # Autogenerated VS/MD/Consulo solution and project files
ExportedObj/ ExportedObj/
.consulo/ .consulo/