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: 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 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/diff/diff.php')

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
-- 
cgit v1.2.1