Resolved merge conflict

2024-11-15 15:18:31 +01:00
parent 0da5aae997 1a115fecda
commit 0914322e2d
5 changed files with 20 additions and 100 deletions
--- a/pyqcrm.pyproject
+++ b/pyqcrm.pyproject
@@ -15,8 +15,10 @@
        "gui/EmployeTables.qml",
        "gui/AddCustomer.qml",
        "pyqcrm.qrc",
+
        "qml.qrc",
        "gui/qmldir",
        "gui/TpBar.qml"
+
    ]
 }