From fce20fd8988d83e27e76ea057c25d189347df400 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen 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/renderer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/includes/diff/renderer.php') 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 -- cgit v1.2.1