makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-26 03:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

TortoiseMerge seems to mess up the newlines... very very annoying bug.

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9254 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2009-01-13 10:55:04 +00:00
parent 189e7cdf45
commit fce20fd898
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/diff/diff.php
View file

@ -107,7 +107,7 @@ class diff
* *
* Example: * Example:
* <code> * <code>
* $diff = &new diff($lines1, $lines2); * $diff = new diff($lines1, $lines2);
* $rev = $diff->reverse(); * $rev = $diff->reverse();
* </code> * </code>
* *
@ -822,4 +822,4 @@ class diff3_block_builder
} }
} }
?> ?>

2
phpBB/includes/diff/renderer.php
View file

@ -857,4 +857,4 @@ class diff_renderer_side_by_side extends diff_renderer
} }
?> ?>

2
phpBB/install/install_update.php
View file

@ -1666,4 +1666,4 @@ class install_update extends module
} }
} }
?> ?>

2
phpBB/language/en/install.php
View file

@ -625,4 +625,4 @@ $lang = array_merge($lang, array(
'TOPICS_TOPIC_TITLE' => 'Welcome to phpBB3', 'TOPICS_TOPIC_TITLE' => 'Welcome to phpBB3',
)); ));
?> ?>