resolve conflicts

microbiome · May 22, 2024 · 0b29738 · 0b29738
1 parent 50373eb
commit 0b29738
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -62,5 +62,5 @@ Suggests:
     microbiomeDataSets,
     bluster
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 VignetteBuilder: knitr
diff --git a/man/miaViz-package.Rd b/man/miaViz-package.Rd
diff --git a/man/plotAbundance.Rd b/man/plotAbundance.Rd