version bump

DavisLaboratory · Jun 24, 2024 · f8b5178 · f8b5178
1 parent 8a7676e
commit f8b5178
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,5 @@
 Package: hoodscanR
 Title: Spatial cellular neighbourhood scanning in R
-<<<<<<< HEAD
 Version: 1.2.1
 Authors@R: 
     c(person(given = "Ning",