updt

Flavjack · Sep 5, 2024 · bb60f04 · bb60f04
2 parents 54b829e + b044c94
commit bb60f04
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.Rproj.user/shared/notebooks/paths b/.Rproj.user/shared/notebooks/paths
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 C:/Users/floza/git/huito/CRAN-SUBMISSION="101C7CF3"
 C:/Users/floza/git/huito/R/image_import.R="6DC96AF5"
 C:/Users/floza/git/huito/R/include_image.R="B5F44936"
@@ -7,3 +8,6 @@ C:/Users/floza/git/huito/pkgdown/favicon/phenotyping.R="0DC92901"
 C:/Users/floza/git/huito/vignettes/labels.Rmd="4C4BA3DC"
 C:/Users/floza/git/lozanoisla/content/code/seed-collection.r="663EDA75"
 G:/My Drive/moodle/lecture_sist-agricola/library/slides2collection.R="3C3F9496"
+=======
+C:/Users/Maiz/github/huito/CRAN-SUBMISSION="B78FB76A"
+>>>>>>> b044c941fef9fab329e78e1779ba3944ac851a6e