summaryrefslogtreecommitdiffstats
path: root/openecomp-ui/src/sdc-app/common/merge
diff options
context:
space:
mode:
Diffstat (limited to 'openecomp-ui/src/sdc-app/common/merge')
-rw-r--r--openecomp-ui/src/sdc-app/common/merge/MergeEditorConstants.js18
1 files changed, 10 insertions, 8 deletions
diff --git a/openecomp-ui/src/sdc-app/common/merge/MergeEditorConstants.js b/openecomp-ui/src/sdc-app/common/merge/MergeEditorConstants.js
index bb25a1af06..14745e241d 100644
--- a/openecomp-ui/src/sdc-app/common/merge/MergeEditorConstants.js
+++ b/openecomp-ui/src/sdc-app/common/merge/MergeEditorConstants.js
@@ -1,5 +1,5 @@
/*!
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2016-2018 European Support Limited
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,15 +13,17 @@
* or implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
-
import keyMirror from 'nfvo-utils/KeyMirror.js';
-export const actionTypes = keyMirror({
- LOAD_CONFLICTS: null,
- ADD_ACTIONS: null,
- LOAD_CONFLICT: null,
- DATA_PROCESSED: null
-});
+export const actionTypes = keyMirror(
+ {
+ LOAD_CONFLICTS: null,
+ ADD_ACTIONS: null,
+ LOAD_CONFLICT: null,
+ DATA_PROCESSED: null
+ },
+ 'mergeEditor'
+);
export const rules = {
SKIP: 'skip',