Skip to content
Snippets Groups Projects
Commit 2ff9d6c9 authored by Christopher Schankula's avatar Christopher Schankula :earth_africa:
Browse files

fix .gitignore conflict

parent 6ea421e5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 4 deletions
.gitignore
+ 0
− 4
View file @ 2ff9d6c9
......@@ -7,10 +7,6 @@
*.blg
*DS_Store*
*.csv
<<<<<<< HEAD
*/bin
*.ser
=======
*.ser
.idea/
>>>>>>> refs/remotes/origin/master
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment