- fix for merge conflicts

CeMOS-Mannheim · Jul 1, 2024 · 3e6d7b4 · 3e6d7b4
1 parent 6a5b8e4
commit 3e6d7b4
Showing 1 changed file with 0 additions and 21 deletions.
diff --git a/req.txt b/req.txt
@@ -4,39 +4,19 @@ dplyr
 tibble
 tidyr
 ggplot2
-<<<<<<< HEAD
 forcats
-=======
-purrr
-readr
-stringr
-forcats
-shinyFiles
->>>>>>> main
 MALDIquant
 MALDIquantForeign
 DT
 plotly
 shiny
-<<<<<<< HEAD
 shinyFiles
 shinycssloaders
 shinyhelper
 shinybusy
 shinytest2
 common
 knitr
-=======
-shinycssloaders
-shinyhelper
-shinybusy
-shinythemes
-shinyWidgets
-shinytest2
-common
-knitr
-devtools
->>>>>>> main
 sparsepca
 platetools
 fs
@@ -45,4 +25,3 @@ latrend
 dtwclust
 readr
 clValid
-clusterCrit