aboutsummaryrefslogtreecommitdiff
path: root/.gitattributes
blob: 1fab0e0991f16b0dc9b5a9fbb5d55a4c0d324a2e (plain)
1
2
3
4
5
paper.tex merge=ours
tex/src/*.tex merge=ours
reproduce/analysis/config/*.conf  merge=ours
reproduce/software/config/TARGETS.conf merge=ours
reproduce/software/config/texlive-packages.conf merge=ours