From cef3b5db16ca946a95d00d59c79c887fecc19b4b Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Mon, 31 Jan 2022 17:30:03 +0100
Subject: [PATCH] Fix mergeconflict

CURA-8684
---
 plugins/ImageReader/ConfigUI.qml | 1 -
 1 file changed, 1 deletion(-)

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