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/includes/diff | |
| 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/includes/diff')
| -rw-r--r-- | phpBB/includes/diff/diff.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/diff/engine.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/diff/renderer.php | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/phpBB/includes/diff/diff.php b/phpBB/includes/diff/diff.php index 60af574b78..3ab546f03c 100644 --- a/phpBB/includes/diff/diff.php +++ b/phpBB/includes/diff/diff.php @@ -1144,5 +1144,3 @@ class diff3_block_builder array_splice($array, sizeof($array), 0, $lines); } } - -?>
\ No newline at end of file diff --git a/phpBB/includes/diff/engine.php b/phpBB/includes/diff/engine.php index 982149457d..1aa052e86e 100644 --- a/phpBB/includes/diff/engine.php +++ b/phpBB/includes/diff/engine.php @@ -550,5 +550,3 @@ class diff_engine } } } - -?>
\ No newline at end of file diff --git a/phpBB/includes/diff/renderer.php b/phpBB/includes/diff/renderer.php index 5cb1b6ada9..957491365b 100644 --- a/phpBB/includes/diff/renderer.php +++ b/phpBB/includes/diff/renderer.php @@ -856,5 +856,3 @@ class diff_renderer_side_by_side extends diff_renderer } } - -?>
\ No newline at end of file |