From 96c7a600c194f89e9e0c30aeb716df4a93ad923a Mon Sep 17 00:00:00 2001
From: Anatasof Wirapraja <anatasof.wirapraja@gmail.com>
Date: Fri, 6 Sep 2019 15:58:09 +0700
Subject: fixed conflicting lines

---
 pages/TaskListForm.ui.qml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pages/TaskListForm.ui.qml b/pages/TaskListForm.ui.qml
index 1142e96..5e5734c 100644
--- a/pages/TaskListForm.ui.qml
+++ b/pages/TaskListForm.ui.qml
@@ -4,7 +4,6 @@ import QtQuick.Controls.Material 2.12
 import QtQuick.Layouts 1.3
 
 ListView {
-<<<<<<< HEAD
     width: 362
     spacing: 12
     property alias menuButton: menuButton
@@ -85,14 +84,4 @@ ListView {
             icon.source: "/assets/add-24px.svg"
         }
     }
-=======
-	width: 362
-	spacing: 12
-
-	Rectangle {
-		id: rectangle
-		anchors.fill: parent
-		z: -1
-	}
->>>>>>> 7331461b29097c08fcdd557461aedb78cfe243d1
 }
-- 
cgit v1.2.3