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

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