merge with remote

[talweg.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 7b5eb35..d0a62df 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ NAMESPACE
 #R CMD build/check files
 /*.Rcheck/
 /*.tar.gz
+<<<<<<< HEAD
 
 #object & library files
 *.[oa]