sync with main

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