Update scm_version.py

sunpy · Oct 30, 2024 · b74852f · b74852f
1 parent b609599
commit b74852f
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/sunkit_image/_dev/scm_version.py b/sunkit_image/_dev/scm_version.py
@@ -5,11 +5,7 @@
 try:
     from setuptools_scm import get_version
 
-<<<<<<<
-    version = get_version(root=Path("..") / "..", relative_to=__file__)
-=======
     version = get_version(root=Path('../..'), relative_to=__file__)
->>>>>>>
 except ImportError:
     raise
 except Exception as e: