From c7514dfab9b6d16fa860b0cb2664553881b8fd10 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 6 Sep 2016 10:47:36 +0200 Subject: [PATCH] Fix merge mistake I hadn't really figured out PyCharm's merge tool yet. --- resources/qml/MonitorButton.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/MonitorButton.qml b/resources/qml/MonitorButton.qml index 6f36c694ed..1e6c35d36d 100644 --- a/resources/qml/MonitorButton.qml +++ b/resources/qml/MonitorButton.qml @@ -4,6 +4,7 @@ import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuick.Controls.Styles 1.1 +import QtQuick.Dialogs 1.1 import QtQuick.Layouts 1.1 import UM 1.1 as UM