Merge pull request #690 from alan-turing-institute/fix-merge-markers

Fix merge markers
alan-turing-institute · Jun 9, 2020 · 2686232 · 2686232
2 parents 65d87bf + 20bed94
commit 2686232
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/environment_configs/package_lists/whitelist-core-r-cran-tier3.list b/environment_configs/package_lists/whitelist-core-r-cran-tier3.list
@@ -125,7 +125,6 @@ import
 kaps
 kernlab
 KernSmooth
->>>>>>> master
 KFAS
 kstMatrix
 latex2exp
@@ -208,7 +207,6 @@ R2jags
 R2WinBUGS
 R6
 R62S3
->>>>>>> master
 RandomFields
 randomForestSRC
 RApiSerialize