diff options
| author | Mate Bartus <mate.bartus@gmail.com> | 2015-10-18 11:21:56 +0200 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2015-10-18 11:21:56 +0200 |
| commit | 85eb6a0bc0575c687eb43efe61cf206b26b26af8 (patch) | |
| tree | 73ac951fd6373502fd6bfb3b4ba773c463c8004f /phpBB/phpbb/install/controller | |
| parent | 8f5a0ad6f73e7b7757b02c827436384c96069b5a (diff) | |
| download | forums-85eb6a0bc0575c687eb43efe61cf206b26b26af8.tar forums-85eb6a0bc0575c687eb43efe61cf206b26b26af8.tar.gz forums-85eb6a0bc0575c687eb43efe61cf206b26b26af8.tar.bz2 forums-85eb6a0bc0575c687eb43efe61cf206b26b26af8.tar.xz forums-85eb6a0bc0575c687eb43efe61cf206b26b26af8.zip | |
[ticket/14039] Fix language constants and comments
PHPBB3-14039
Diffstat (limited to 'phpBB/phpbb/install/controller')
| -rw-r--r-- | phpBB/phpbb/install/controller/archive_download.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/install/controller/archive_download.php b/phpBB/phpbb/install/controller/archive_download.php index 711e1f2f0c..e1f7634963 100644 --- a/phpBB/phpbb/install/controller/archive_download.php +++ b/phpBB/phpbb/install/controller/archive_download.php @@ -38,7 +38,7 @@ class archive_download /** * Sends response with the merge conflict archive * - * Merge conflicts are always have to be resolved manually, + * Merge conflicts always have to be resolved manually, * so we use a different archive for that. * * @return BinaryFileResponse |