summaryrefslogtreecommitdiff
path: root/src/resources/conflict-mixed-blue.png
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/conflict-mixed-blue.png')
-rw-r--r--src/resources/conflict-mixed-blue.pngbin692 -> 571 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/src/resources/conflict-mixed-blue.png b/src/resources/conflict-mixed-blue.png
index 2afbb304..dc0c33f2 100644
--- a/src/resources/conflict-mixed-blue.png
+++ b/src/resources/conflict-mixed-blue.png
Binary files differ