cleaned up merge artefacts in gitignore

tclose · tclose · commit 958f5c12e868 · 2024-02-06T20:19:13.000+11:00
diff --git a/.gitignore b/.gitignore
@@ -20,10 +20,6 @@ __pycache__
 *.egg-info
 ~*
 /outputs
-*.venv
 /test-data
 /nipype2pydra/_version.py
-<<<<<<< HEAD
-=======
-*.venv-py38
->>>>>>> 9611b94 (added py38 to gitignore)
+
