X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=.gitignore;h=d0a62dfafba24d684c0a467f32fcaea66c5cef26;hb=81cb8b9e38ae82f2c108f11df56d53c9e29366ed;hp=0156460aa7d3693ae1880b83563abf5381249fb9;hpb=41e7dc8f4b4f93e83de7b3ccc1f406eea4a8e63b;p=talweg.git

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