Merge branch 'main' of https://github.com/BriceNocenti/ggfacto

# Conflicts: # DESCRIPTION # R/geometrical_data_analysis.R # man/ggmca.Rd
BriceNocenti · Jan 18, 2024 · eda9674 · eda9674
2 parents e731e65 + aeb19fc
commit eda9674
Show file tree

Hide file tree

Showing 3 changed files with 350 additions and 0 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -18,7 +18,11 @@ BugReports: https://github.com/BriceNocenti/ggfacto/issues
 License: GPL (>= 3)
 Encoding: UTF-8
 LazyData: true
+<<<<<<< HEAD
 RoxygenNote: 7.3.0
+=======
+RoxygenNote: 7.1.2
+>>>>>>> aeb19fcf1abf716a0a183977ccf8e1ceb31c0cb0
 Imports: 
     FactoMineR (>= 2.0.0),
     ggiraph (>= 0.8.2),