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