diff options
Diffstat (limited to 'phpBB/phpbb/install/controller/archive_download.php')
| -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 |