summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.vue
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.vue')
-rw-r--r--app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.vue6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.vue b/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.vue
index a856d38c089..87eeb272659 100644
--- a/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.vue
+++ b/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.vue
@@ -35,7 +35,11 @@ export default {
<td :class="lineCssClass(line)" class="diff-line-num header"></td>
<td :class="lineCssClass(line)" class="line_content header">
<strong>{{ line.richText }}</strong>
- <button type="button" @click="handleSelected({ file, line })">
+ <button
+ type="button"
+ class="gl-border-1 gl-border-solid"
+ @click="handleSelected({ file, line })"
+ >
{{ line.buttonTitle }}
</button>
</td>