diff options
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/archive-conflict-loser.png | bin | 0 -> 18052 bytes |
| -rw-r--r-- | src/resources/archive-conflict-mixed.png | bin | 0 -> 18052 bytes |
| -rw-r--r-- | src/resources/archive-conflict-neutral.png | bin | 0 -> 18052 bytes |
| -rw-r--r-- | src/resources/archive-conflict-winner.png | bin | 0 -> 18052 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/src/resources/archive-conflict-loser.png b/src/resources/archive-conflict-loser.png Binary files differnew file mode 100644 index 00000000..77d2e0fa --- /dev/null +++ b/src/resources/archive-conflict-loser.png diff --git a/src/resources/archive-conflict-mixed.png b/src/resources/archive-conflict-mixed.png Binary files differnew file mode 100644 index 00000000..e71e0167 --- /dev/null +++ b/src/resources/archive-conflict-mixed.png diff --git a/src/resources/archive-conflict-neutral.png b/src/resources/archive-conflict-neutral.png Binary files differnew file mode 100644 index 00000000..aba45314 --- /dev/null +++ b/src/resources/archive-conflict-neutral.png diff --git a/src/resources/archive-conflict-winner.png b/src/resources/archive-conflict-winner.png Binary files differnew file mode 100644 index 00000000..f6260575 --- /dev/null +++ b/src/resources/archive-conflict-winner.png |
