From c024a3784fbab28d724e038b784d3b72125848c4 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 26 Aug 2009 12:22:31 +0200 Subject: very minor fix: removing invalid doc left-over from merge --- ChangeLog | 9 --------- 1 file changed, 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc9f9ea3..98eefe27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -156,15 +156,6 @@ Version 4.3.0 [DEVEL] (rgerhards), 2009-04-17 connection broke, but not if there was a problem with statement execution. The most probable case for such a case would be invalid sql inside the template, and this is now much easier to diagnose. -<<<<<<< HEAD:ChangeLog ---------------------------------------------------------------------------- -Version 4.2.1 [v4-stable] (rgerhards), 2009-0?-?? -- bugfix: stderr/stdout were not closed to be able to emit error messages, - but this caused ssh sessions to hang. Now we close them after the - initial initialization. See forum thread: - http://kb.monitorware.com/controlling-terminal-issues-t9875.html -======= ->>>>>>> bd7542b51593739893922e8ec8fb6d7195d06cbe:ChangeLog --------------------------------------------------------------------------- Version 4.2.0 [v4-stable] (rgerhards), 2009-06-23 - bugfix: light and full delay watermarks had invalid values, badly -- cgit