From d6ef1e47468a10ea4199978c1eac4cf0112ca449 Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Mon, 16 Mar 2009 22:41:37 +0000
Subject: [PATCH] gah stupid conflict resolution :@ fix line ending in r9379

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9380 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 ab3f01af71..eb9c28ec85 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -862,4 +862,4 @@
 </div>
 
 </body>
-</html>
+</html>
\ No newline at end of file