diff options
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, |