From 01e1232cf85f09efde780537bbbca40fd6f0c097 Mon Sep 17 00:00:00 2001
From: Al12rs <gabriel.cortesi@outlook.com>
Date: Thu, 2 Aug 2018 15:33:27 +0200
Subject: Added new "loose files overwrite archive" icon and all the flags. The
 logic to show it is still missing until the other issues are fixed.

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

(limited to 'src/resources.qrc')

diff --git a/src/resources.qrc b/src/resources.qrc
index 1dccce0b..dff1ad72 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -47,7 +47,8 @@
         <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_redundant">resources/conflict-redundant.png</file> 
+        <file alias="emblem_conflict_loose_overwrite_archive">resources/conflict-overwrite-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>
-- 
cgit v1.3.1