summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Wu <victor@gitlab.com>2017-05-22 01:21:19 +0000
committerVictor Wu <victor@gitlab.com>2017-05-22 01:21:19 +0000
commitbe6bf183a76eb42308e0c4fd17a90a1a4b86f498 (patch)
tree5370a11c78843312d7bf607c95e4161ea4949a5b
parentdfead7a87d050b409e4b9f85160d4a126b054247 (diff)
downloadgitlab-ce-reword-merge-via-command-line.tar.gz
Update mr_widget_merge_help.jsreword-merge-via-command-line
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/mr_widget_merge_help.js4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_merge_help.js b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_merge_help.js
index 86bc8d704e5..f551663637d 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_merge_help.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_merge_help.js
@@ -11,9 +11,7 @@ export default {
<a
data-toggle="modal"
href="#modal_merge_info">
- merge locally instead
- </a>
- .
+ merge locally instead</a>.
</template>
<template v-else>
<a