summaryrefslogtreecommitdiff
path: root/src/resources/conflict-hidden.png
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/conflict-hidden.png')
-rw-r--r--src/resources/conflict-hidden.pngbin0 -> 231 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/src/resources/conflict-hidden.png b/src/resources/conflict-hidden.png
new file mode 100644
index 00000000..84a5da98
--- /dev/null
+++ b/src/resources/conflict-hidden.png
Binary files differ