resolve conflict

IMOS-AnimalTracking · Feb 1, 2024 · bd54fec · bd54fec
1 parent e29ed58
commit bd54fec
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,12 +1,7 @@
 Package: remora
 Title: Rapid Extraction of Marine Observations for Roving Animals
-<<<<<<< HEAD
-Version: 0.8-0
-Date: 2023-11-14
-=======
-Version: 0.8-0.9501
+Version: 0.8-01
 Date: 2024-02-01
->>>>>>> staging
 Authors@R: 
     c(person(given = "Fabrice",
            family = "Jaine",