Fix conflicts in merge

LieberInstitute · Nov 23, 2024 · ddc3ed5 · ddc3ed5
2 parents c686ce4 + 4f3cdef
commit ddc3ed5
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,11 @@
 Package: smokingMouse
+<<<<<<< HEAD
 Title: Get access to the smoking-nicotine-mouse LIBD project data
 Version: 0.99.91
+=======
+Title: Provides access to smokingMouse project data 
+Version: 1.5.0
+>>>>>>> upstream/devel
 Date: 2023-07-21
 Authors@R: 
     c(