Skip to content
Snippets Groups Projects
Commit 2be693bf authored by MarvelousAnything's avatar MarvelousAnything
Browse files

Fixed rebase stuff in .gitignore

parent 188dbb99
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 0 additions and 5 deletions
.gitignore
+ 0
− 5
View file @ 2be693bf
......@@ -22,12 +22,8 @@ _deps
tranqc
.idea/
<<<<<<< HEAD
.cmake/
build/
=======
.cmake
CMakeFiles/
# Created by https://www.toptal.com/developers/gitignore/api/macos
......@@ -67,4 +63,3 @@ Temporary Items
*.icloud
# End of https://www.toptal.com/developers/gitignore/api/macos
>>>>>>> 291aba8 (Update .gitignore, remove main.c and tree.c)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment