summaryrefslogtreecommitdiffstats
path: root/openecomp-ui/src/sdc-app/common/merge
diff options
context:
space:
mode:
authorArielk <Ariel.Kenan@amdocs.com>2019-07-07 12:56:11 +0300
committerAvi Gaffa <avi.gaffa@amdocs.com>2019-07-17 06:31:57 +0000
commita51eac038c8896b2413d0c57e223d49870fd1079 (patch)
tree46f3a92468658a4b982afe3390bafa959c98a404 /openecomp-ui/src/sdc-app/common/merge
parent3338a073437dfd2f43c3b2572d7964d98a3bfb08 (diff)
upgrade to ONAP-UI
Change-Id: Iddc6a62cc0b7981daa5ceb2422b967c95b031422 Issue-ID: SDC-2411 Signed-off-by: Arielk <Ariel.Kenan@amdocs.com>
Diffstat (limited to 'openecomp-ui/src/sdc-app/common/merge')
-rw-r--r--openecomp-ui/src/sdc-app/common/merge/MergeEditorView.jsx6
1 files changed, 2 insertions, 4 deletions
diff --git a/openecomp-ui/src/sdc-app/common/merge/MergeEditorView.jsx b/openecomp-ui/src/sdc-app/common/merge/MergeEditorView.jsx
index 0664952b23..9abe5e12ce 100644
--- a/openecomp-ui/src/sdc-app/common/merge/MergeEditorView.jsx
+++ b/openecomp-ui/src/sdc-app/common/merge/MergeEditorView.jsx
@@ -16,13 +16,11 @@
import React from 'react';
import i18n from 'nfvo-utils/i18n/i18n.js';
import union from 'lodash/union.js';
-import Button from 'sdc-ui/lib/react/Button.js';
-// import Checkbox from 'sdc-ui/lib/react/Checkbox.js';
+import { Button, SVGIcon, Radio } from 'onap-ui-react';
+// import Checkbox from 'onap-ui-react/Checkbox.js';
import Input from 'nfvo-components/input/validation/Input.jsx';
import GridSection from 'nfvo-components/grid/GridSection.jsx';
import GridItem from 'nfvo-components/grid/GridItem.jsx';
-import SVGIcon from 'sdc-ui/lib/react/SVGIcon.js';
-import Radio from 'sdc-ui/lib/react/Radio.js';
import equal from 'deep-equal';
import { ResolutionTypes } from './MergeEditorConstants.js';