From 65815bd0970c97d5920af51a1b4c531fc56c4c9c Mon Sep 17 00:00:00 2001
From: Alexander Bruy <alexander.bruy@gmail.com>
Date: Thu, 22 May 2025 06:10:26 +0100
Subject: [PATCH] fix conflict

---
 src/ui/qgsoraclenewconnectionbase.ui | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/ui/qgsoraclenewconnectionbase.ui b/src/ui/qgsoraclenewconnectionbase.ui
index 19740dc0871..0f7190b76d2 100644
--- a/src/ui/qgsoraclenewconnectionbase.ui
+++ b/src/ui/qgsoraclenewconnectionbase.ui
@@ -197,19 +197,6 @@
         </property>
        </widget>
       </item>
-      <item row="8" column="0">
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
       <item row="7" column="1">
        <widget class="QgsFilterLineEdit" name="txtSchema">
         <property name="toolTip">