summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/conflict-mixed-blue.pngbin0 -> 692 bytes
-rw-r--r--src/resources/conflict-overwrite-blue.pngbin0 -> 964 bytes
-rw-r--r--src/resources/conflict-overwritten-blue.pngbin0 -> 577 bytes
-rw-r--r--src/resources/red-archive-conflict-loser.pngbin0 -> 746 bytes
-rw-r--r--src/resources/tracked.pngbin0 -> 2284 bytes
5 files changed, 0 insertions, 0 deletions
diff --git a/src/resources/conflict-mixed-blue.png b/src/resources/conflict-mixed-blue.png
new file mode 100644
index 00000000..2afbb304
--- /dev/null
+++ b/src/resources/conflict-mixed-blue.png
Binary files differ
diff --git a/src/resources/conflict-overwrite-blue.png b/src/resources/conflict-overwrite-blue.png
new file mode 100644
index 00000000..3247e7b7
--- /dev/null
+++ b/src/resources/conflict-overwrite-blue.png
Binary files differ
diff --git a/src/resources/conflict-overwritten-blue.png b/src/resources/conflict-overwritten-blue.png
new file mode 100644
index 00000000..3a032a55
--- /dev/null
+++ b/src/resources/conflict-overwritten-blue.png
Binary files differ
diff --git a/src/resources/red-archive-conflict-loser.png b/src/resources/red-archive-conflict-loser.png
new file mode 100644
index 00000000..18284ee2
--- /dev/null
+++ b/src/resources/red-archive-conflict-loser.png
Binary files differ
diff --git a/src/resources/tracked.png b/src/resources/tracked.png
new file mode 100644
index 00000000..6aab3023
--- /dev/null
+++ b/src/resources/tracked.png
Binary files differ