summaryrefslogtreecommitdiff
path: root/kelakon.qrc
diff options
context:
space:
mode:
Diffstat (limited to 'kelakon.qrc')
-rw-r--r--kelakon.qrc4
1 files changed, 4 insertions, 0 deletions
diff --git a/kelakon.qrc b/kelakon.qrc
index 0ca9dd7..a3c2a2a 100644
--- a/kelakon.qrc
+++ b/kelakon.qrc
@@ -4,7 +4,11 @@
<file>Login.qml</file>
<file>LoginForm.ui.qml</file>
<file>kelakon-logo.png</file>
+<<<<<<< HEAD
+ <file>onboarding-1.png</file>
+=======
<file>pages/Email.qml</file>
<file>pages/EmailForm.ui.qml</file>
+>>>>>>> 2679bcec2d5938125634d970f025518c42498628
</qresource>
</RCC>