diff options
| author | Anatasof Wirapraja <anatasof.wirapraja@gmail.com> | 2019-08-22 20:49:54 +0700 |
|---|---|---|
| committer | Anatasof Wirapraja <anatasof.wirapraja@gmail.com> | 2019-08-22 20:49:54 +0700 |
| commit | 9d617a46ca8537433eeeaec2d57c30694d3407cd (patch) | |
| tree | fd53aceec150b18c9c498a1b3f0a45b3cfe69409 /kelakon.qrc | |
| parent | 38f58c78c64fd7c7d555976306c2a9b6f5e6df5a (diff) | |
| parent | 2679bcec2d5938125634d970f025518c42498628 (diff) | |
Merge branch 'development' of ssh://darapsa.co.id/usr/local/git/kelakon into development
# Conflicts:
# kelakon.qrc
Diffstat (limited to 'kelakon.qrc')
| -rw-r--r-- | kelakon.qrc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kelakon.qrc b/kelakon.qrc index 151de66..a3c2a2a 100644 --- a/kelakon.qrc +++ b/kelakon.qrc @@ -4,6 +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> |