From ce74d6857d6876c4eb38cddbdae3ea5878514655 Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@qt.io>
Date: Thu, 5 Jun 2025 07:25:07 +0200
Subject: [PATCH] QmlDesigner: fix unresolved conflict

Change-Id: I5b83f91162abf79859cb5b086a93bab6ce30a263
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../components/propertyeditor/fileresourcesmodel.cpp          | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp
index ad4a4e3cde6..f2625ca59ca 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp
@@ -183,9 +183,6 @@ QVariant FileResourcesModel::modelNodeBackend() const
     return QVariant();
 }
 
-<<<<<<< HEAD   (a2c8a1 Core: fix rare crash in GeneralSettingsWidget::apply())
-bool filterMetaIcons(const QString &fileName)
-=======
 static bool checkIgnoreFile(const QString &fileName)
 {
     QFileInfo info(fileName);
@@ -203,7 +200,6 @@ static bool checkIgnoreFile(const QString &fileName)
 }
 
 static bool filterMetaIcons(const QString &fileName)
->>>>>>> CHANGE (1a3998 QmlDesigner: Skip Dependencies folder for resources)
 {
     QFileInfo info(fileName);