3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix mergeconflict

Browse source 
CURA-8684
This commit is contained in:
Jaime van Kessel 2022-01-31 17:30:03 +01:00
parent 474497b8bb
commit cef3b5db16
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/ImageReader/ConfigUI.qml
View file

@ -2,7 +2,6 @@
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.1 import QtQuick 2.1
<<<<<<< HEAD
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import QtQuick.Window 2.1 import QtQuick.Window 2.1