From fce20fd8988d83e27e76ea057c25d189347df400 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Tue, 13 Jan 2009 10:55:04 +0000
Subject: [PATCH] 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
---
 phpBB/includes/diff/diff.php     | 4 ++--
 phpBB/includes/diff/renderer.php | 2 +-
 phpBB/install/install_update.php | 2 +-
 phpBB/language/en/install.php    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/phpBB/includes/diff/diff.php b/phpBB/includes/diff/diff.php
index 70a4166b9c..c54f139161 100644
--- 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
 	}
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/phpBB/includes/diff/renderer.php b/phpBB/includes/diff/renderer.php
index 9144e0ab82..02fb6ccc37 100644
--- 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
 
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 978b4cfe8d..d2c4641112 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -1666,4 +1666,4 @@ class install_update extends module
 	}
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index b1784d26e8..1b337d0985 100644
--- 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',
 ));
 
-?>
+?>
\ No newline at end of file