diff options
Diffstat (limited to 'app/assets/javascripts/diffs/components/merge_conflict_warning.vue')
| -rw-r--r-- | app/assets/javascripts/diffs/components/merge_conflict_warning.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/diffs/components/merge_conflict_warning.vue b/app/assets/javascripts/diffs/components/merge_conflict_warning.vue index 6e1e6f5c2d0..c37a1d75650 100644 --- a/app/assets/javascripts/diffs/components/merge_conflict_warning.vue +++ b/app/assets/javascripts/diffs/components/merge_conflict_warning.vue @@ -44,8 +44,8 @@ export default { <gl-button v-if="resolutionPath" :href="resolutionPath" - variant="info" - class="gl-mr-5 gl-alert-action" + variant="confirm" + class="gl-mr-3 gl-alert-action" > {{ __('Resolve conflicts') }} </gl-button> |