merge with remote

[talweg.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 030f5d7..d0a62df 100644 (file)
--- 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