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