From 6d1d9d84e34061fe0d543f648285f22de28d8660 Mon Sep 17 00:00:00 2001 From: Jayaprakash Date: Tue, 5 Mar 2024 10:47:04 +0530 Subject: [PATCH] fix: resolves merge conflicts with base branch --- frontend/rust-lib/flowy-folder/src/manager.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/frontend/rust-lib/flowy-folder/src/manager.rs b/frontend/rust-lib/flowy-folder/src/manager.rs index 7a86550e3128..e8895cefadff 100644 --- a/frontend/rust-lib/flowy-folder/src/manager.rs +++ b/frontend/rust-lib/flowy-folder/src/manager.rs @@ -30,11 +30,9 @@ use crate::entities::{ UpdateViewParams, ViewPB, WorkspacePB, WorkspaceSettingPB, }; use crate::manager_observer::{ - notify_child_views_changed, notify_did_update_workspace, notify_parent_view_did_change, - ChildViewChangeReason, - generate_child_view_update_payload, notify_child_views_changed, notify_parent_view_did_change, - notify_workspace_overview_child_views_changed, notify_workspace_overview_parent_view_did_change, - ChildViewChangeReason, + generate_child_view_update_payload, notify_child_views_changed, notify_did_update_workspace, + notify_parent_view_did_change, notify_workspace_overview_child_views_changed, + notify_workspace_overview_parent_view_did_change, ChildViewChangeReason, }; use crate::notification::{ send_notification, send_workspace_setting_notification, FolderNotification,