diff options
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..280f260 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,6 @@ +paper.tex merge=ours +tex/src/delete-me.mk merge=ours +tex/src/delete-me-demo.mk merge=ours +reproduce/analysis/make/delete-me.mk merge=ours +reproduce/software/config/TARGETS.conf merge=ours +reproduce/analysis/config/delete-me-num.conf merge=ours
\ No newline at end of file |