resolve merge conflict

This commit is contained in:
Alex Tran
2022-02-27 12:49:18 -06:00
parent e608c61ba5
commit bd34be92e6
3 changed files with 0 additions and 57 deletions

View File

@@ -16,16 +16,9 @@ class SearchPage extends HookConsumerWidget {
final isSearchEnabled = ref.watch(searchPageStateProvider).isSearchEnabled;
useEffect(() {
<<<<<<< HEAD
searchFocusNode = FocusNode();
return () {
searchFocusNode.dispose();
};
=======
print("search");
searchFocusNode = FocusNode();
return () => searchFocusNode.dispose();
>>>>>>> bfde3084924e247bc8f7004babf38605fe341a18
}, []);
return Scaffold(