minor fixes

Intron7 · Intron7 · commit cb24eebe6f20 · 2022-05-16T11:02:39.000+02:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -22,11 +22,8 @@ dependencies = [
     "matplotlib>=3.5.0",   
 ]
 #dynamic = ["version"]
-<<<<<<< HEAD
 version = "0.1.0"
-=======
-version = "0.0.3"
->>>>>>> 4740e502a2973761a6377388289b060143eeea58
+
 #packages = ["alpha_viewer"]
 
 [project.urls]
