save post-merge chaos

BriceNocenti · Jan 19, 2024 · a8bc1e2 · a8bc1e2
1 parent eda9674
commit a8bc1e2
Show file tree

Hide file tree

Showing 3 changed files with 376 additions and 519 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -18,11 +18,7 @@ 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),