fix rebase

This commit is contained in:
Michael Zanetti 2020-11-28 15:37:42 +01:00
parent 1e14cbc71f
commit ce918430ed

View File

@ -225,8 +225,6 @@
<file>ui/components/ThingStatusIcons.qml</file>
<file>ui/components/InfoPaneBase.qml</file>
<file>ui/components/ThingInfoPane.qml</file>
<file>ui/system/ZigbeeNetworkSettingsPage.qml</file>
<file>ui/system/ZigbeeNetworkAddPage.qml</file>
<file>ui/system/ZigbeeSettingsPage.qml</file>
<file>ui/system/ZigbeeAddNetworkPage.qml</file>
<file>ui/system/ZigbeeNetworkPage.qml</file>