diff options
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 |
