fix merge resolve leftovers

israelmcmc · May 9, 2024 · aa4957b · aa4957b
1 parent 373ee5c
commit aa4957b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/cosipy/_version.py b/cosipy/_version.py
@@ -1,5 +1 @@
 __version__ = "0.3.0.dev0"
-<<<<<<< HEAD
-
-=======
->>>>>>> e5f8aa2 (Bump up version to develop. Fix typo)