summaryrefslogtreecommitdiff
path: root/src/resources/conflict-overwritten-blue.png
Commit message (Expand)AuthorAgeFilesLines
* Better blue conflict iconsBlueAmulet2020-12-021-0/+0
* Add loose file/archive conflict iconsSilarn2018-12-121-0/+0