diff options
| author |   Einav Weiss Keidar <einavw@amdocs.com> | 2018-08-13 16:19:46 +0300 |
|---|---|---|
| committer |   Avi Gaffa <avi.gaffa@amdocs.com> | 2019-02-11 13:50:22 +0000 |
| commit | 1801b24389baa8e3f7298ff2c41e2512b19c1290 (patch) | |
| tree | d3d2a15f53aa28698280d609548298d177f9280d /openecomp-ui/src/sdc-app/common/merge/MergeEditorView.jsx | |
| parent | af8e36eb7f43803bd9cf40e9b46a0c0c8f47c781 (diff) | |
react 16 upgrade
Issue-ID: SDC-1762
Change-Id: I7701f12fc63bb09f8c985c7c893b984701dcbfab
Signed-off-by: Einav Keidar <einavw@amdocs.com>
Diffstat (limited to 'openecomp-ui/src/sdc-app/common/merge/MergeEditorView.jsx')
| -rw-r--r-- | openecomp-ui/src/sdc-app/common/merge/MergeEditorView.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openecomp-ui/src/sdc-app/common/merge/MergeEditorView.jsx b/openecomp-ui/src/sdc-app/common/merge/MergeEditorView.jsx index a7e36a39fc..0664952b23 100644 --- a/openecomp-ui/src/sdc-app/common/merge/MergeEditorView.jsx +++ b/openecomp-ui/src/sdc-app/common/merge/MergeEditorView.jsx @@ -98,8 +98,8 @@ class ConflictCategory extends React.Component { <GridItem className="resolve"> <Button className="conflict-resolve-btn" - btnType="outline" - color="gray" + btnType="secondary" + size="default" onClick={() => onResolveConflict({ conflictId, |