Web: Client: fix merge

2022-07-22 19:07:26 +03:00 · 2022-07-22 19:07:26 +03:00 · df55fceb47
commit df55fceb47
parent 44c65ee52c
1 changed files with 0 additions and 3 deletions
--- a/web/ASC.Web.Client/src/store/index.js
+++ b/web/ASC.Web.Client/src/store/index.js
@ -28,11 +28,8 @@ const store = {
  backup: backupStore,
  common: commonStore,
  bannerStore: bannerStore,
-<<<<<<< .mine
  ssoStore: ssoStore,
-=======
  profileActionsStore: profileActionsStore,
->>>>>>> .theirs
 };

 export default store;