X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=.gitignore;h=d0a62dfafba24d684c0a467f32fcaea66c5cef26;hb=81cb8b9e38ae82f2c108f11df56d53c9e29366ed;hp=7b5eb3548d8826261ee9439763e70e9461be1d1d;hpb=689aa1d3c58e8b1e9fdfa9b895ca38c7228f56cc;p=talweg.git

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