Merge branch 'develop' into cleanup_and_tests

israelmcmc · May 9, 2024 · 373ee5c · 373ee5c
2 parents 6932101 + d7924b8
commit 373ee5c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # cosipy
 
 [![unit_tests](https://github.com/cositools/cosipy/actions/workflows/unit_tests.yml/badge.svg?branch=develop)](https://github.com/cositools/cosipy/actions/workflows/unit_tests.yml)
+[![codecov](https://codecov.io/gh/cositools/cosipy/branch/develop/graph/badge.svg?token=FQGI2VG4OY)](https://codecov.io/gh/cositools/cosipy)
 
 The cosipy library is [COSI](https://cosi.ssl.berkeley.edu)'s high-level analysis software.
 

diff --git a/cosipy/_version.py b/cosipy/_version.py
@@ -1 +1,5 @@
 __version__ = "0.3.0.dev0"
+<<<<<<< HEAD
+
+=======
+>>>>>>> e5f8aa2 (Bump up version to develop. Fix typo)