From b05f56c8084fc95590f8a79b9d8a7faf4e0b1844 Mon Sep 17 00:00:00 2001
From: Al12rs <gabriel.cortesi@outlook.com>
Date: Thu, 2 Aug 2018 13:12:31 -0500
Subject: Added red archive conflict icon and made the conflicts tab change
 font for files that come from an archive.

---
 src/resources.qrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/resources.qrc')

diff --git a/src/resources.qrc b/src/resources.qrc
index 9e4c9192..5ed1780e 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -50,7 +50,7 @@
         <file alias="emblem_conflict_redundant">resources/conflict-redundant.png</file>
         <file alias="archive_loose_conflict_mixed">resources/conflict-mixed-blue.png</file>
         <file alias="archive_loose_conflict_overwrite">resources/conflict-overwrite-blue.png</file>
-        <file alias="archive_loose_conflict_overwritten">resources/conflict-overwritten-blue.png</file>
+        <file alias="archive_loose_conflict_overwritten">resources/red-archive-conflict-loser.png</file>
         <file alias="emblem_notes">resources/accessories-text-editor.png</file>
         <file alias="version_date">resources/x-office-calendar.png</file>
         <file alias="warning_16">resources/dialog-warning_16.png</file>
-- 
cgit v1.3.1