summaryrefslogtreecommitdiff
path: root/src/resources/archive-conflict-mixed.png
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/archive-conflict-mixed.png')
-rw-r--r--src/resources/archive-conflict-mixed.pngbin18052 -> 969 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/src/resources/archive-conflict-mixed.png b/src/resources/archive-conflict-mixed.png
index e71e0167..df20532c 100644
--- a/src/resources/archive-conflict-mixed.png
+++ b/src/resources/archive-conflict-mixed.png
Binary files differ