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

[Carlos De Maine]

Git commit d21c7e96dec61311ce3de537ce4cef372bda676c by Carlos De Maine.
Committed on 05/06/2024 at 09:13.
Pushed by carlosdem into branch 'Neon/unstable'.

Revert "patch out rebase remnants"

This reverts commit 5e38a3f938bd9b79bf3a6edd99ff0ec89fadc901

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

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

diff --git a/debian/patches/rebase_remnants.diff b/debian/patches/rebase_remnants.diff
deleted file mode 100644
index 6c9f837..0000000
--- a/debian/patches/rebase_remnants.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index 938b0de..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-rebase_remnants.diff