mirror of
https://github.com/KevinMidboe/immich.git
synced 2025-10-29 17:40:28 +00:00
Resolve merge conflict
This commit is contained in:
@@ -16,10 +16,16 @@ 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(
|
||||
|
||||
Reference in New Issue
Block a user