diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-11-06 17:43:10 +0300 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-11-06 17:43:10 +0300 |
| commit | b4d167a8f78509e241639e560ee1fed545d2dbc1 (patch) | |
| tree | ad31164a4fe19d7c3dbc7d9e9f1d3ee6e3e65637 /app/assets/javascripts/blob/pdf/index.js | |
| parent | c5377b97968ba9edefe7766dac77cc9fbbaa4e2c (diff) | |
| parent | d4ceec9d47a7da5fa17cb6e161ac491e13fcb8bd (diff) | |
Merge branch 'master' into feature/sm/3691-expose-per-project-pipeline-idfeature/sm/3691-expose-per-project-pipeline-id
Diffstat (limited to 'app/assets/javascripts/blob/pdf/index.js')
| -rw-r--r-- | app/assets/javascripts/blob/pdf/index.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/blob/pdf/index.js b/app/assets/javascripts/blob/pdf/index.js index 0ed915c1ac9..7109f356540 100644 --- a/app/assets/javascripts/blob/pdf/index.js +++ b/app/assets/javascripts/blob/pdf/index.js @@ -48,10 +48,10 @@ export default () => { class="text-center" v-if="error"> <span v-if="loadError"> - An error occured whilst loading the file. Please try again later. + An error occurred whilst loading the file. Please try again later. </span> <span v-else> - An error occured whilst decoding the file. + An error occurred whilst decoding the file. </span> </p> </div> |