[neon/neon-packaging/mauikit-texteditor/Neon/unstable] debian/patches: patch out rebase remnants

[Carlos De Maine]

Git commit 5e38a3f938bd9b79bf3a6edd99ff0ec89fadc901 by Carlos De Maine.
Committed on 04/02/2024 at 22:25.
Pushed by carlosdem into branch 'Neon/unstable'.

patch out rebase remnants

A  +22   -0    debian/patches/rebase_remnants.diff
A  +1    -0    debian/patches/series

https://invent.kde.org/neon/neon-packaging/mauikit-texteditor/-/commit/5e38a3f938bd9b79bf3a6edd99ff0ec89fadc901

diff --git a/debian/patches/rebase_remnants.diff b/debian/patches/rebase_remnants.diff
new file mode 100644
index 0000000..6c9f837
--- /dev/null
+++ b/debian/patches/rebase_remnants.diff
@@ -0,0 +1,22 @@
+diff --git a/src/controls.6/TextEditor.qml b/src/controls.6/TextEditor.qml
+index 359eca04255d08a12a7bf87dbc2bb2cd54b04513..142729de01ad78bf95303bd2d5d04a4c23ae66c4 100644
+--- a/src/controls.6/TextEditor.qml
++++ b/src/controls.6/TextEditor.qml
+@@ -645,8 +645,7 @@ Page
+                         }                                    // TODO: Move cursor
+                     }
+                     
+-<<<<<<< HEAD
+-=======
++
+                     onPressAndHold:
+                     {
+ //                         if(Maui.Handy.isMobile)
+@@ -657,7 +656,6 @@ Page
+                         documentMenu.targetClick(spellcheckhighlighterLoader, body.positionAt(point.position.x, point.position.y));
+                     }
+                     
+->>>>>>> fa82aef (test fixes to mobile contetxualmenu)
+                     onPressed:
+                     {
+                         if(Maui.Handy.isMobile)
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..938b0de
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+rebase_remnants.diff