bigginlab · IAlibay · Jun 20, 2019 · Jun 20, 2019
diff --git a/.gitignore b/.gitignore
@@ -1,12 +1,4 @@
-<<<<<<< HEAD
-
-lintools/testdata/.DS_Store
-=======
-# OS generated files #
-######################
-/lintools/.DS_Store
-
+.DS_Store
 lintools/topol.ipynb
 Dockerfile
 *.pyc
->>>>>>> 21d76e036ac3874177a134ff9aa8b34f5c40f793
diff --git a/lintools/analysis/__init__.pyc b/lintools/analysis/__init__.pyc
diff --git a/lintools/analysis/hbonds.pyc b/lintools/analysis/hbonds.pyc
diff --git a/lintools/analysis/residence_time.pyc b/lintools/analysis/residence_time.pyc
diff --git a/lintools/data.pyc b/lintools/data.pyc
diff --git a/lintools/figure.pyc b/lintools/figure.pyc
diff --git a/lintools/molecule.pyc b/lintools/molecule.pyc
diff --git a/lintools/plots.pyc b/lintools/plots.pyc
diff --git a/lintools/testdata/.DS_Store b/lintools/testdata/.DS_Store