X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=.gitignore;h=d0a62dfafba24d684c0a467f32fcaea66c5cef26;hb=81cb8b9e38ae82f2c108f11df56d53c9e29366ed;hp=92a17ad10c7363d3cc6b92b9781bcdeef1678297;hpb=4ba96933bd3eb63800ef9e98edbabe693aec7340;p=talweg.git

diff --git a/.gitignore b/.gitignore
index 92a17ad..d0a62df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ NAMESPACE
 #R CMD build/check files
 /*.Rcheck/
 /*.tar.gz
+<<<<<<< HEAD
 
 #object & library files
 *.[oa]
@@ -30,6 +31,7 @@ data/*.csv
 #misc
 *.png
 #*.tex
+/AirNormand/
 
 #.gitattributes/.gitfat files are generated by initialize.sh
 .gitattributes