summaryrefslogtreecommitdiffstats
path: root/images/conflicts.png (follow)
AgeCommit message (Expand)AuthorFilesLines
2021-04-25Remove imagesMalfurious1-0/+0
2015-08-25Make images slightly shorterMichael Allen1-0/+0
2015-08-25Add example images for the readmeMichael Allen1-0/+0