diff options
| author | Jaime van Kessel <nallath@gmail.com> | 2022-01-31 19:30:03 +0300 |
|---|---|---|
| committer | Jaime van Kessel <nallath@gmail.com> | 2022-01-31 19:30:03 +0300 |
| commit | cef3b5db16ca946a95d00d59c79c887fecc19b4b (patch) | |
| tree | bc27dc40af37212c27d4f27b55eaac3da38af45d /plugins/ImageReader | |
| parent | 474497b8bb567ac32fbe0936eb49acf40765870c (diff) | |
Fix mergeconflict
CURA-8684
Diffstat (limited to 'plugins/ImageReader')
| -rw-r--r-- | plugins/ImageReader/ConfigUI.qml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/plugins/ImageReader/ConfigUI.qml b/plugins/ImageReader/ConfigUI.qml index eb8b481dd7..ecfc86fc05 100644 --- a/plugins/ImageReader/ConfigUI.qml +++ b/plugins/ImageReader/ConfigUI.qml @@ -2,7 +2,6 @@ // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.1 -<<<<<<< HEAD import QtQuick.Controls 2.15 import QtQuick.Layouts 1.3 import QtQuick.Window 2.1 |