diff options
| -rw-r--r-- | .gitattributes | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/.gitattributes b/.gitattributes index 280f260..1fab0e0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,5 @@ 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 +tex/src/*.tex merge=ours +reproduce/analysis/config/*.conf merge=ours reproduce/software/config/TARGETS.conf merge=ours -reproduce/analysis/config/delete-me-num.conf merge=ours
\ No newline at end of file +reproduce/software/config/texlive-packages.conf merge=ours
\ No newline at end of file |