projects
/
talweg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
merge with remote
[talweg.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
92a17ad
..
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]
@@
-30,6
+31,7
@@
data/*.csv
#misc
*.png
#*.tex
+/AirNormand/
#.gitattributes/.gitfat files are generated by initialize.sh
.gitattributes