diff options
| author | Anatasof Wirapraja <anatasof.wirapraja@gmail.com> | 2019-08-22 21:09:12 +0700 |
|---|---|---|
| committer | Anatasof Wirapraja <anatasof.wirapraja@gmail.com> | 2019-08-22 21:09:12 +0700 |
| commit | 75bcbfb33c1521615391eb44bf9141f5a7498848 (patch) | |
| tree | 442051166061a18ecaf5d37482f9495870dd7088 /kelakon.qrc | |
| parent | 9d617a46ca8537433eeeaec2d57c30694d3407cd (diff) | |
deleted conflicted lines
Diffstat (limited to 'kelakon.qrc')
| -rw-r--r-- | kelakon.qrc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/kelakon.qrc b/kelakon.qrc index a3c2a2a..a7e39c6 100644 --- a/kelakon.qrc +++ b/kelakon.qrc @@ -4,11 +4,8 @@ <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 + <file>pages/Email.qml</file> + <file>pages/EmailForm.ui.qml</file> </qresource> </RCC> |