diff options
| author | BlueAmulet <43395286+BlueAmulet@users.noreply.github.com> | 2020-12-02 11:15:00 -0700 |
|---|---|---|
| committer | BlueAmulet <43395286+BlueAmulet@users.noreply.github.com> | 2020-12-02 11:15:00 -0700 |
| commit | 44eb0946a7840f726cee0d4ec649a5676cd0498d (patch) | |
| tree | 0cbe87c1139a90fdc1b5947af11e18af41eb62c5 /src | |
| parent | c3a957169612e6563b17c2e740006f1abd29f6ff (diff) | |
Better blue conflict icons
Diffstat (limited to 'src')
| -rw-r--r-- | src/resources/conflict-mixed-blue.png | bin | 692 -> 571 bytes |
| -rw-r--r-- | src/resources/conflict-overwrite-blue.png | bin | 964 -> 594 bytes |
| -rw-r--r-- | src/resources/conflict-overwritten-blue.png | bin | 577 -> 455 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/src/resources/conflict-mixed-blue.png b/src/resources/conflict-mixed-blue.png Binary files differindex 2afbb304..dc0c33f2 100644 --- a/src/resources/conflict-mixed-blue.png +++ b/src/resources/conflict-mixed-blue.png diff --git a/src/resources/conflict-overwrite-blue.png b/src/resources/conflict-overwrite-blue.png Binary files differindex 3247e7b7..129a0665 100644 --- a/src/resources/conflict-overwrite-blue.png +++ b/src/resources/conflict-overwrite-blue.png diff --git a/src/resources/conflict-overwritten-blue.png b/src/resources/conflict-overwritten-blue.png Binary files differindex 3a032a55..856aca16 100644 --- a/src/resources/conflict-overwritten-blue.png +++ b/src/resources/conflict-overwritten-blue.png |
