From 75bcbfb33c1521615391eb44bf9141f5a7498848 Mon Sep 17 00:00:00 2001
From: Anatasof Wirapraja <anatasof.wirapraja@gmail.com>
Date: Thu, 22 Aug 2019 21:09:12 +0700
Subject: deleted conflicted lines

---
 kelakon.qrc | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'kelakon.qrc')

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>
-- 
cgit v1.2.3