diff options
Diffstat (limited to 'src/resources/conflict-overwritten.png')
| -rw-r--r-- | src/resources/conflict-overwritten.png | bin | 0 -> 543 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/src/resources/conflict-overwritten.png b/src/resources/conflict-overwritten.png Binary files differnew file mode 100644 index 00000000..386b4b75 --- /dev/null +++ b/src/resources/conflict-overwritten.png |