fix merge

Flavjack · Oct 25, 2023 · c340534 · c340534
2 parents 054627d + 61d0ea8
commit c340534
Show file tree

Hide file tree

Showing 35 changed files with 9 additions and 4,620 deletions.
diff --git a/.Rproj.user/shared/notebooks/paths b/.Rproj.user/shared/notebooks/paths
@@ -1,7 +1,12 @@
+<<<<<<< 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"
 C:/Users/floza/git/huito/pkgdown/_pkgdown.yml="51470CF9"
 C:/Users/floza/git/huito/pkgdown/favicon/logo.R="04984071"
 C:/Users/floza/git/huito/pkgdown/favicon/phenotyping.R="0DC92901"
 C:/Users/floza/git/huito/vignettes/labels.Rmd="4C4BA3DC"
+=======
+C:/Users/Maiz/github/huito/NAMESPACE="ABE3DA6A"
+C:/Users/Maiz/github/huito/vignettes/germinar.Rmd="D04C4D5A"
+>>>>>>> 61d0ea84050823f25a2ca9709111a9acf68ac78d
diff --git a/docs/articles/huito.html b/docs/articles/huito.html
diff --git a/docs/articles/huito.pdf b/docs/articles/huito.pdf
diff --git a/docs/articles/huito.png b/docs/articles/huito.png
diff --git a/docs/articles/huito/img_0.jpg b/docs/articles/huito/img_0.jpg
diff --git a/docs/articles/huito/img_1.png b/docs/articles/huito/img_1.png
diff --git a/docs/articles/labels_files/crosstalk-1.2.0/css/crosstalk.min.css b/docs/articles/labels_files/crosstalk-1.2.0/css/crosstalk.min.css