merge from develop and fixes previous broken commit

src/common/redux/actions/index.ts

@@ -18,12 +18,9 @@ import * as loadActions from "./load";
 import * as netActions from "./net/";
 import * as readerActions from "./reader/";
 import * as toastActions from "./toast/";
-<<<<<<< HEAD
 import * as sessionActions from "./session/";
 import * as catalogActions from "./catalog";
-=======
 import * as annotationActions from "./annotation";
->>>>>>> e7126b80 (add: saga logic)
 
 export {
     historyActions,
@@ -39,10 +36,7 @@ export {
     downloadActions,
     keyboardActions,
     loadActions,
-<<<<<<< HEAD
     sessionActions,
     catalogActions,
-=======
     annotationActions,
->>>>>>> e7126b80 (add: saga logic)
 };

src/renderer/library/redux/middleware/sync.ts

@@ -6,12 +6,8 @@
 // ==LICENSE-END==
 
 import {
-<<<<<<< HEAD
-    apiActions, authActions, catalogActions, downloadActions, i18nActions, keyboardActions, lcpActions, readerActions, sessionActions,
-=======
-    annotationActions,
-    apiActions, authActions, downloadActions, i18nActions, keyboardActions, readerActions,
->>>>>>> e7126b80 (add: saga logic)
+    catalogActions, lcpActions, sessionActions,
+    apiActions, authActions, downloadActions, i18nActions, keyboardActions, readerActions, annotationActions,
 } from "readium-desktop/common/redux/actions";
 import { syncFactory } from "readium-desktop/renderer/common/redux/middleware/syncFactory";
 
@@ -37,17 +33,14 @@ const SYNCHRONIZABLE_ACTIONS: string[] = [
 
     downloadActions.abort.ID,
 
-<<<<<<< HEAD
     sessionActions.enable.ID,
 
     lcpActions.renewPublicationLicense.ID,
     lcpActions.returnPublication.ID,
     lcpActions.unlockPublicationWithPassphrase.ID,
 
     catalogActions.getCatalog.ID, // request to get catalog view
-=======
     annotationActions.exportW3CAnnotationSetFromAnnotations.ID,
->>>>>>> e7126b80 (add: saga logic)
 ];
 
 export const reduxSyncMiddleware = syncFactory(SYNCHRONIZABLE_ACTIONS);