We use cookies to ensure you get the best experience on our website
Home Explore Help News
Sign In
neuroinformatics
/
oscar-test-data
6
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

merge .gitignore

Henry Crosswell 2 months ago
parent
4c88f31d5a
commit
53d935819b
1 changed files with 0 additions and 3 deletions
Split View Show Diff Stats
  1. 0 3
      .gitignore

+ 0 - 3
.gitignore
View File 

@@ -1,5 +1,2 @@
 
-<<<<<<< HEAD
 
-=======
 
 # OS specific ignore file
 
->>>>>>> master
 
 .DS_Store