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

diff --git a/.gitignore b/.gitignore
index 4d19f10..d0a62df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,37 @@ NAMESPACE
 #R CMD build/check files
 /*.Rcheck/
 /*.tar.gz
+<<<<<<< HEAD
+
+#object & library files
+*.[oa]
+*.so
+
+#jupyter checkpoints + generated ipynb,html
+.ipynb_checkpoints/
+/reports/*.ipynb
+/reports/*.html
+
+#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
+*.pdf
+!/biblio/*.pdf
+*.aux
+*.dvi
+*.log
+*.out
+*.toc
+*.synctex.gz
+figure/