update gitignore

SantanderMetGroup · Jul 3, 2020 · c1d2788 · c1d2788
1 parent 39dbcbf
commit c1d2788
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,12 +1,8 @@
 .Rproj.user
 .Rhistory
 .RData
-<<<<<<< HEAD
 transformeR.Rproj
-=======
 .Ruserdata
 transformeR.Rproj
 ignore
 .Rprofile
-
->>>>>>> 6f6725b2a8182cd526302ddd57d751d4eb0b27eb