resolve merge conflict

2025-10-29 17:40:28 +00:00 · 2022-02-27 12:49:18 -06:00
parent e608c61ba5
commit bd34be92e6
3 changed files with 0 additions and 57 deletions
--- a/mobile/lib/modules/search/ui/search_bar.dart
+++ b/mobile/lib/modules/search/ui/search_bar.dart
@@ -27,10 +27,7 @@ class SearchBar extends HookConsumerWidget with PreferredSizeWidget {
        focusNode: searchFocusNode,
        autofocus: false,
        onTap: () {
-<<<<<<< HEAD
-=======
          ref.watch(searchPageStateProvider.notifier).getSuggestedSearchTerms();
->>>>>>> bfde3084924e247bc8f7004babf38605fe341a18
          ref.watch(searchPageStateProvider.notifier).enableSearch();
          searchFocusNode.requestFocus();
        },