commit a51eac038c8896b2413d0c57e223d49870fd1079
author Arielk <Ariel.Kenan@amdocs.com> Sun Jul 07 12:56:11 2019 +0300
committer Avi Gaffa <avi.gaffa@amdocs.com> Wed Jul 17 06:31:57 2019 +0000
tree 46f3a92468658a4b982afe3390bafa959c98a404
parent 3338a073437dfd2f43c3b2572d7964d98a3bfb08

upgrade to ONAP-UI

Change-Id: Iddc6a62cc0b7981daa5ceb2422b967c95b031422
Issue-ID: SDC-2411
Signed-off-by: Arielk <Ariel.Kenan@amdocs.com>

openecomp-ui/src/sdc-app/common/merge/MergeEditorView.jsx

diff --git a/openecomp-ui/src/sdc-app/common/merge/MergeEditorView.jsx b/openecomp-ui/src/sdc-app/common/merge/MergeEditorView.jsx
index 0664952..9abe5e1 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';