From c178a3745bb846c7de0a7e0ec6e5e5dbda849fc5 Mon Sep 17 00:00:00 2001
From: Anatasof Wirapraja <anatasof.wirapraja@gmail.com>
Date: Sat, 31 Aug 2019 12:30:14 +0700
Subject: remove unnecessary lines after merge conflict

---
 pages/CreateProfileForm.ui.qml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'pages')

diff --git a/pages/CreateProfileForm.ui.qml b/pages/CreateProfileForm.ui.qml
index 4d46180..45b6dcf 100644
--- a/pages/CreateProfileForm.ui.qml
+++ b/pages/CreateProfileForm.ui.qml
@@ -7,11 +7,8 @@ Rectangle {
     id: rectangle
     color: "#fff"
 
-<<<<<<< HEAD
     property alias enterFullName: enterFullName
-=======
     property alias backButton: backButton
->>>>>>> 58ed74cd70d6de558b8d9cb77844e95b5f72b341
 
     ToolBar {
         id: toolbar
@@ -33,7 +30,7 @@ Rectangle {
             spacing: 8
 
             ToolButton {
-		    id: backButton
+                id: backButton
                 icon.name: "back-icon"
                 icon.source: "/assets/arrow-back-24px.svg"
                 icon.color: "transparent"
@@ -51,6 +48,9 @@ Rectangle {
             ToolButton {
             }
         }
+        Rectangle {
+            color: "transparent"
+        }
     }
     Rectangle {
         id: userEmail
@@ -135,7 +135,7 @@ Rectangle {
 
 
 /*##^## Designer {
-    D{i:0;autoSize:true;height:480;width:640}D{i:1;anchors_width:640}D{i:7;anchors_height:48;anchors_y:143}
-D{i:9;anchors_y:322}D{i:11;anchors_y:54}
+    D{i:0;autoSize:true;height:480;width:640}D{i:1;anchors_width:640}D{i:8;anchors_height:48;anchors_y:143}
+D{i:10;anchors_y:322}D{i:12;anchors_y:54}
 }
  ##^##*/
-- 
cgit v1.2.3