From bc1ee36ed3174cbd2aed6dbc64a3859b566069af Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Tue, 31 Mar 2009 12:41:48 +0000
Subject: [PATCH] Conflict resolution again oops

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9420 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/docs/CHANGELOG.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index ef72152bce..d8a5432113 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -878,4 +878,4 @@
 </div>
 
 </body>
-</html>
+</html>
\ No newline at end of file