fix merge confilicts

Merge branch 'main' into dev # Conflicts: # components/server.R # req.txt
CeMOS-Mannheim · Jul 2, 2024 · 9f69406 · 9f69406
2 parents 7872ad6 + 094613b
commit 9f69406
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/components/server.R b/components/server.R
@@ -297,8 +297,9 @@ server <- function(input, output, session) {
   output$clustPlot <- renderPlotly({
     if (appData$show_plot & !is.null(appData$clust)) {
       show_spinner()
-      plotClusters(appData$clust, k = input$num_cluster)
+      p <- plotClusters(appData$clust, k = input$num_cluster)
       hide_spinner()
+      return(p)
     }
   })
 

diff --git a/req.txt b/req.txt
@@ -25,3 +25,4 @@ latrend
 dtwclust
 readr
 clValid
+clusterCrit