i dont know what im doing

2025-02-26 15:10:42 +01:00
parent dec4ca59f0 f0cde5ec20
commit e7d0b7cdb5
5 changed files with 142 additions and 25 deletions
--- a/Gui/PyqcrmConf.qml
+++ b/Gui/PyqcrmConf.qml
@@ -21,6 +21,13 @@ Item
        {
            text: qsTr("Das Unternehmen")
        }
+<<<<<<< HEAD
+=======
+        TabButton
+        {
+            text: qsTr("Sicherung")
+        }
+>>>>>>> schnacke
    }

    StackLayout
@@ -55,6 +62,18 @@ Item
                anchors.fill: parent
            }
        }
+<<<<<<< HEAD
+=======
+        Item
+        {
+            id: backup
+            BackupSettings
+            {
+                id: backupSettings
+                anchors.fill: parent
+            }
+        }
+>>>>>>> schnacke
    }

    RowLayout