From f9f70b224e25c2d5bff017fd08d32521d39d5b08 Mon Sep 17 00:00:00 2001
From: Silarn <jrim@rimpo.org>
Date: Thu, 2 Aug 2018 11:54:48 -0500
Subject: Add loose file/archive conflict icons

---
 src/resources.qrc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/resources.qrc')

diff --git a/src/resources.qrc b/src/resources.qrc
index dff1ad72..9e4c9192 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -47,8 +47,10 @@
         <file alias="emblem_conflict_mixed">resources/conflict-mixed.png</file>
         <file alias="emblem_conflict_overwrite">resources/conflict-overwrite.png</file>
         <file alias="emblem_conflict_overwritten">resources/conflict-overwritten.png</file>
-        <file alias="emblem_conflict_redundant">resources/conflict-redundant.png</file> 
-        <file alias="emblem_conflict_loose_overwrite_archive">resources/conflict-overwrite-blue.png</file>
+        <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="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>
@@ -94,8 +96,8 @@
         <file alias="string">resources/contents/conversation.png</file>
         <file alias="bsa">resources/contents/locked-chest.png</file>
         <file alias="menu">resources/contents/config.png</file>
-		<file alias="inifile">resources/contents/feather-and-scroll.png</file>
-		<file alias="modgroup">resources/contents/xedit.png</file>
+        <file alias="inifile">resources/contents/feather-and-scroll.png</file>
+        <file alias="modgroup">resources/contents/xedit.png</file>
     </qresource>
     <qresource prefix="/qt/etc">
         <file>qt.conf</file>
-- 
cgit v1.3.1