From 2d9a182b2993a621d08081ebb1395a9dbe33abe9 Mon Sep 17 00:00:00 2001
From: Miller Adulu <milleradulu@gmail.com>
Date: Fri, 19 Mar 2021 20:02:52 +0300
Subject: [PATCH] Fix merge request

---
 lib/widgets/text_selection.dart | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/widgets/text_selection.dart b/lib/widgets/text_selection.dart
index a2621cbf..22b687b2 100644
--- a/lib/widgets/text_selection.dart
+++ b/lib/widgets/text_selection.dart
@@ -722,7 +722,6 @@ class _EditorTextSelectionGestureDetectorState
     );
   }
 }
-<<<<<<< HEAD
 
 class _TransparentTapGestureRecognizer extends TapGestureRecognizer {
   _TransparentTapGestureRecognizer({
@@ -738,5 +737,3 @@ class _TransparentTapGestureRecognizer extends TapGestureRecognizer {
     }
   }
 }
-=======
->>>>>>> dda5805935568d42b71a1a1faf7fbdf078d72633