fix: resolves merge conflicts with base branch

AppFlowy-IO · Mar 5, 2024 · 6d1d9d8 · 6d1d9d8
1 parent 386fb3f
commit 6d1d9d8
Showing 1 changed file with 3 additions and 5 deletions.
diff --git 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,