resolve merge conflict

2020-06-14 21:29:31 +02:00
parent 613ec38694 247192f7dd
commit 2ab630f8eb
5 changed files with 249 additions and 3 deletions
--- a/application.qrc
+++ b/application.qrc
@@ -74,6 +74,7 @@
        <file>res/css/Default.css</file>
        <file>res/css/Light.css</file>
        <file>res/css/Midnight.css</file>
+        <file>res/css/test.css</file>
    </qresource>
    <qresource prefix="/images/blue">
        <file>res/images/blue/unchecked.png</file>
@@ -85,4 +86,7 @@
        <file>res/images/blue/blue_rightArrow_small.png</file>
        <file>res/images/blue/blue_qtreeview_selected.png</file>
    </qresource>
+    <qresource prefix="/images">
+        <file>res/images/tile.png</file>
+    </qresource>
 </RCC>