Merge remote-tracking branch 'origin/main' into cansavvy/check-spelling

jhudsl · Dec 20, 2024 · 089bf68 · 089bf68
2 parents 6195756 + df7ffcb
commit 089bf68
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/inst/extdata/exclude_files.txt b/inst/extdata/exclude_files.txt
@@ -1 +1,12 @@
+<<<<<<< HEAD
 docs/*
+=======
+About.Rmd
+docs/*
+style-sets/*
+manuscript/*
+CONTRIBUTING.md
+LICENSE.md
+code_of_conduct.md
+README.md
+>>>>>>> origin/main