clean up merge

omnideconv · May 27, 2024 · 2774fcb · 2774fcb
1 parent 7043a1a
commit 2774fcb
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/R/DeconvExplorer.R b/R/DeconvExplorer.R
@@ -2100,10 +2100,7 @@ DeconvExplorer <- function(deconvexp_bulk = NULL,
       },
       deleteFile = TRUE
     )
-<<<<<<< HEAD
-
-=======
->>>>>>> aa2a3bb4dc946dc1e3af93a5462df63292d64f52
+
 
     # functions ---------------------------------------------------------------
     brush_action <- function(df, input, output, session) {