fix version

databio · Mar 13, 2020 · c60867b · c60867b
1 parent 5f4d58c
commit c60867b
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/logmuse/_version.py b/logmuse/_version.py
@@ -1,5 +1 @@
-<<<<<<< HEAD
-__version__ = "0.2.5"
-=======
-__version__ = "0.2.6-dev"
->>>>>>> f395cb8ef8d55b461b4fe9dba8b035d75576e150
+__version__ = "0.2.6"