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

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9254 89ea8834-ac86-4346-8a33-228a782c2dd0
2025-07-25 19:38:53 +00:00 · 2009-01-13 10:55:04 +00:00 · 2009-01-13 10:55:04 +00:00 · fce20fd898
commit fce20fd898
parent 189e7cdf45
4 changed files with 5 additions and 5 deletions
--- a/phpBB/includes/diff/diff.php
+++ b/phpBB/includes/diff/diff.php
@ -107,7 +107,7 @@ class diff
 	*
 	* Example:
 	* <code>
-	* $diff = &new diff($lines1, $lines2);
+	* $diff = new diff($lines1, $lines2);
 	* $rev = $diff->reverse();
 	* </code>
 	*
@ -822,4 +822,4 @@ class diff3_block_builder
 	}
 }

-?>
+?>
--- a/phpBB/includes/diff/renderer.php
+++ b/phpBB/includes/diff/renderer.php
@ -857,4 +857,4 @@ class diff_renderer_side_by_side extends diff_renderer

 }

-?>
+?>
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@ -1666,4 +1666,4 @@ class install_update extends module
 	}
 }

-?>
+?>
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@ -625,4 +625,4 @@ $lang = array_merge($lang, array(
 	'TOPICS_TOPIC_TITLE'			=> 'Welcome to phpBB3',
 ));

-?>
+?>