X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=.gitignore;h=d0a62dfafba24d684c0a467f32fcaea66c5cef26;hb=81cb8b9e38ae82f2c108f11df56d53c9e29366ed;hp=030f5d7b5289008192d901e47af04af5f43f2c1a;hpb=9003747badc4416d68cab45ff17de3ecea327942;p=talweg.git

diff --git a/.gitignore b/.gitignore
index 030f5d7..d0a62df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ NAMESPACE
 #R CMD build/check files
 /*.Rcheck/
 /*.tar.gz
+<<<<<<< HEAD
 
 #object & library files
 *.[oa]
@@ -27,12 +28,17 @@ NAMESPACE
 #large CSV files
 data/*.csv
 
+#misc
+*.png
+#*.tex
+/AirNormand/
+
 #.gitattributes/.gitfat files are generated by initialize.sh
 .gitattributes
 .gitfat
 
 #Rmarkdown, knitr + LaTeX generated files
-*.tex
+#*.tex
 *.pdf
 !/biblio/*.pdf
 *.aux