conflict

mbousq · Sep 29, 2020 · da4cc7b · da4cc7b
1 parent f16b302
commit da4cc7b
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -20,14 +20,7 @@ Mass Spectrometry Integrator and Corrector
 ``` r
 
 library(MSinco)
-#> Loading required package: data.table
 
 MSinco::run_app()
-<<<<<<< HEAD
 
-=======
-#> Loading required package: shiny
-#> 
-#> Listening on http://127.0.0.1:6695
->>>>>>> a15b88a8e61417c0d51b4dc7cf4a62b09f1d2ea8
 ```