From 44eb0946a7840f726cee0d4ec649a5676cd0498d Mon Sep 17 00:00:00 2001
From: BlueAmulet <43395286+BlueAmulet@users.noreply.github.com>
Date: Wed, 2 Dec 2020 11:15:00 -0700
Subject: Better blue conflict icons

---
 src/resources/conflict-mixed-blue.png       | Bin 692 -> 571 bytes
 src/resources/conflict-overwrite-blue.png   | Bin 964 -> 594 bytes
 src/resources/conflict-overwritten-blue.png | Bin 577 -> 455 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

(limited to 'src/resources')

diff --git a/src/resources/conflict-mixed-blue.png b/src/resources/conflict-mixed-blue.png
index 2afbb304..dc0c33f2 100644
Binary files a/src/resources/conflict-mixed-blue.png and b/src/resources/conflict-mixed-blue.png differ
diff --git a/src/resources/conflict-overwrite-blue.png b/src/resources/conflict-overwrite-blue.png
index 3247e7b7..129a0665 100644
Binary files a/src/resources/conflict-overwrite-blue.png and b/src/resources/conflict-overwrite-blue.png differ
diff --git a/src/resources/conflict-overwritten-blue.png b/src/resources/conflict-overwritten-blue.png
index 3a032a55..856aca16 100644
Binary files a/src/resources/conflict-overwritten-blue.png and b/src/resources/conflict-overwritten-blue.png differ
-- 
cgit v1.3.1