This is a properly implemented git gitnore file.

AbimbolaOO · AbimbolaOO · commit 5b705e08397e · 2019-04-23T09:53:48.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-python/.vscode/
-python/.ipynb_checkpoints/
-python/Readme.ipynb
-=======
 python/.vscode
 python/.ipynb_checkpoints
-Readme.ipynb
->>>>>>> 84caa51986185863749659bca2bbcec1a54c87db
+python/Readme.ipynb
