Merge pull request #6284 from Razer6/fix_grammer_in_mr_page

Fixes #6073, Update grammer in MR accept form

Merge pull request #6284 from Razer6/fix_grammer_in_mr_page
Fixes #6073, Update grammer in MR accept form
6cf24ba9 · Sytse Sijbrandij · 189ae623 · 725d35ed · 6cf24ba9
Commit 6cf24ba9 authored Feb 10, 2014 by Sytse Sijbrandij
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/views/projects/merge_requests/show/_mr_accept.html.haml app/views/projects/merge_requests/show/_mr_accept.html.haml +1 -1

No files found.
--- a/app/views/projects/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml
@@ -60,7 +60,7 @@

  .automerge_widget.already_cannot_be_merged.hide
    .bs-callout.bs-callout-info
-      %strong This merge request already can not be merged. Try to reload page.
+      %strong This merge request can not be merged. Try to reload the page.

  .merge-in-progress.hide
    .bs-callout.bs-callout-success