Remove DOS linefeed

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@1755 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index de8d6dc..f1782ed 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 
+2006-10-12  Martin Kutschker  <martin.t.kutschker@blackbox.net>
+
+       * Fixed bug #4021: array_merge error with PHP 5.0
+       * Changed occurences of PATH_site.'typo3conf/' to PATH_typo3conf and PATH_site.TYPO3_mainDir to PATH_typo3
+
 2006-10-11  Martin Kutschker  <martin.t.kutschker@blackbox.net>
 
        * Changed index "parent" of sys_template to (pid,sorting)