diff options
Diffstat (limited to 'app/assets/javascripts/diffs/components/diff_file.vue')
| -rw-r--r-- | app/assets/javascripts/diffs/components/diff_file.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue index 422bf52a1fa..8f041d1e670 100644 --- a/app/assets/javascripts/diffs/components/diff_file.vue +++ b/app/assets/javascripts/diffs/components/diff_file.vue @@ -393,7 +393,7 @@ export default { v-else-if="conflictResolutionPath" :message=" __( - 'You can %{gitlabLinkStart}resolve conflicts on GitLab%{gitlabLinkEnd} or %{resolveLocallyStart}resolve it locally%{resolveLocallyEnd}.', + 'You can %{gitlabLinkStart}resolve conflicts on GitLab%{gitlabLinkEnd} or %{resolveLocallyStart}resolve them locally%{resolveLocallyEnd}.', ) " > @@ -415,7 +415,7 @@ export default { </gl-sprintf> <gl-sprintf v-else - :message="__('You can %{resolveLocallyStart}resolve it locally%{resolveLocallyEnd}.')" + :message="__('You can %{resolveLocallyStart}resolve them locally%{resolveLocallyEnd}.')" > <template #resolveLocally="{ content }"> <gl-button |