summaryrefslogtreecommitdiffstats
path: root/etc/examples/125-merge-conflict-2.diff
AgeCommit message (Expand)Author
2020-08-05ReorganizeDan Davison