diff options
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.vue')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.vue b/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.vue index 7b1d947ccff..2c89b614c87 100644 --- a/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.vue +++ b/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.vue @@ -35,7 +35,7 @@ export default { <td class="diff-line-num header" :class="lineCssClass(line)"></td> <td class="line_content header" :class="lineCssClass(line)"> <strong>{{ line.richText }}</strong> - <button class="btn" @click="handleSelected({ file, line })"> + <button type="button" @click="handleSelected({ file, line })"> {{ line.buttonTitle }} </button> </td> |