diff options
| author | Anatasof Wirapraja <anatasof.wirapraja@gmail.com> | 2019-09-06 15:54:28 +0700 |
|---|---|---|
| committer | Anatasof Wirapraja <anatasof.wirapraja@gmail.com> | 2019-09-06 15:54:28 +0700 |
| commit | d57dd7dce24f92721f3ff32667aa74f283571715 (patch) | |
| tree | 32dd885b94a409e5bb63c8b179462e151347a800 /pages/TaskListForm.ui.qml | |
| parent | 0213baa65fde3f620da93fb0763e940afa4b257e (diff) | |
| parent | 7331461b29097c08fcdd557461aedb78cfe243d1 (diff) | |
Merge branch 'master' of ssh://darapsa.co.id/usr/local/git/kelakon into development
* 'master' of ssh://darapsa.co.id/usr/local/git/kelakon:
Fixed the task related hierarchies
# Conflicts:
# pages/TaskListForm.ui.qml
Diffstat (limited to 'pages/TaskListForm.ui.qml')
| -rw-r--r-- | pages/TaskListForm.ui.qml | 11 |
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 } |