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