Fix merge request

4 years ago · 2d9a182b29
parent 9c1c374704
commit 2d9a182b29
1 changed files with 0 additions and 3 deletions
--- 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