diff options
| author | Silarn <jrim@rimpo.org> | 2018-08-02 11:54:48 -0500 |
|---|---|---|
| committer | LostDragonist <lost.dragonist@gmail.com> | 2018-12-12 20:16:07 -0600 |
| commit | f9f70b224e25c2d5bff017fd08d32521d39d5b08 (patch) | |
| tree | b49cd0f84795ffd4b061948a4dab8c1953b29088 /src/resources | |
| parent | 01e1232cf85f09efde780537bbbca40fd6f0c097 (diff) | |
Add loose file/archive conflict icons
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/conflict-mixed-blue.png | bin | 0 -> 692 bytes |
| -rw-r--r-- | src/resources/conflict-overwritten-blue.png | bin | 0 -> 577 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/src/resources/conflict-mixed-blue.png b/src/resources/conflict-mixed-blue.png Binary files differnew file mode 100644 index 00000000..2afbb304 --- /dev/null +++ b/src/resources/conflict-mixed-blue.png diff --git a/src/resources/conflict-overwritten-blue.png b/src/resources/conflict-overwritten-blue.png Binary files differnew file mode 100644 index 00000000..3a032a55 --- /dev/null +++ b/src/resources/conflict-overwritten-blue.png |
