WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 2686232

Browse files
jemrobinsonjemrobinson
authored
Merge pull request #690 from alan-turing-institute/fix-merge-markers
Fix merge markers
2 parents 65d87bf + 20bed94 commit 2686232

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

‎environment_configs/package_lists/whitelist-core-r-cran-tier3.list‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ import
125125
kaps
126126
kernlab
127127
KernSmooth
128-
>>>>>>> master
129128
KFAS
130129
kstMatrix
131130
latex2exp
@@ -208,7 +207,6 @@ R2jags
208207
R2WinBUGS
209208
R6
210209
R62S3
211-
>>>>>>> master
212210
RandomFields
213211
randomForestSRC
214212
RApiSerialize

0 commit comments

Comments
 (0)