3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 15:13:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix merge mistake

Browse source 
I hadn't really figured out PyCharm's merge tool yet.
This commit is contained in:
Ghostkeeper 2016-09-06 10:47:36 +02:00
parent fcbf4a93f3
commit c7514dfab9
No known key found for this signature in database
GPG key ID: 701948C5954A7385
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/qml/MonitorButton.qml
View file

@ -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