diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-12-13 16:35:55 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-12-13 16:35:55 +0100 |
| commit | adfa1656fb9d8b5bb601af1d7a6720884954d87a (patch) | |
| tree | abcd16b98d59f11c4362bafe23fbb9c15ae1ed72 /phpBB/language/en/posting.php | |
| parent | bd579c837490a52cb5b8ce9493e2f066bfe4d8a5 (diff) | |
| parent | af5b9a96409d788733fcb1ff367e0c7fb0583702 (diff) | |
| download | forums-adfa1656fb9d8b5bb601af1d7a6720884954d87a.tar forums-adfa1656fb9d8b5bb601af1d7a6720884954d87a.tar.gz forums-adfa1656fb9d8b5bb601af1d7a6720884954d87a.tar.bz2 forums-adfa1656fb9d8b5bb601af1d7a6720884954d87a.tar.xz forums-adfa1656fb9d8b5bb601af1d7a6720884954d87a.zip | |
Merge branch 'ticket/igorw/9556' into develop
* ticket/igorw/9556:
[ticket/9556] Drop php closing tags, add trailing newline
Conflicts:
phpBB/includes/constants.php
Diffstat (limited to 'phpBB/language/en/posting.php')
| -rw-r--r-- | phpBB/language/en/posting.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index 8016a233fd..76701aaf09 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -221,5 +221,3 @@ $lang = array_merge($lang, array( 'WRONG_FILESIZE' => 'The file is too big, maximum allowed size is %1d %2s.', 'WRONG_SIZE' => 'The image must be at least %1$d pixels wide, %2$d pixels high and at most %3$d pixels wide and %4$d pixels high. The submitted image is %5$d pixels wide and %6$d pixels high.', )); - -?>
\ No newline at end of file |