summaryrefslogtreecommitdiffstats
path: root/images/conflicts.png
diff options
context:
space:
mode:
Diffstat (limited to 'images/conflicts.png')
-rw-r--r--images/conflicts.pngbin0 -> 8187 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/images/conflicts.png b/images/conflicts.png
new file mode 100644
index 0000000..89fa338
--- /dev/null
+++ b/images/conflicts.png
Binary files differ