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

resolve conflict by adding git ignore

Henry Crosswell 2 months ago
parent
beeb6b10c1
commit
8c360ad2c0
1 changed files with 0 additions and 8 deletions
Split View Show Diff Stats
  1. 0 8
      .gitignore

+ 0 - 8
.gitignore
View File 

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