summaryrefslogtreecommitdiff
path: root/src/resources/conflict-overwritten-blue.png
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/conflict-overwritten-blue.png')
-rw-r--r--src/resources/conflict-overwritten-blue.pngbin577 -> 455 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/src/resources/conflict-overwritten-blue.png b/src/resources/conflict-overwritten-blue.png
index 3a032a55..856aca16 100644
--- a/src/resources/conflict-overwritten-blue.png
+++ b/src/resources/conflict-overwritten-blue.png
Binary files differ