Merge 20af923 into 560efa0

axondeepseg · Mar 13, 2019 · 5ec7f32 · 5ec7f32
2 parents 560efa0 + 20af923
commit 5ec7f32
Show file tree

Hide file tree

Showing 10 changed files with 767 additions and 674 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 # Can ignore specific files
-.DS_Store
 AxonDeepSeg\.egg-info/
 
 AxonDeepSeg/.adsconfig
@@ -33,4 +32,8 @@ AxonDeepSeg/data_test/AxonDeepSeg*
 
 # Python-related temp files
 .coverage
-.pytest_cache/
+.pytest_cache/
+
+# OS-related files/folders
+__MACOSX/
+.DS_Store