aboutsummaryrefslogtreecommitdiff
path: root/.gitattributes
blob: 280f260113edb1aa007928ce2dec461b715b8362 (plain)
1
2
3
4
5
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