[trac438] remove conflict marker from Changelog

ce77ca46 · Jelte Jansen · 18964f93 · ce77ca46
Commit ce77ca46 authored Feb 03, 2011 by Jelte Jansen
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

ChangeLog ChangeLog +0 -1

No files found.
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,7 +39,6 @@
 	for root zone was added.
 	(Trac #85, svn r3836)

->>>>>>> .merge-right.r3894
  127.  [bug]       stephen
 	During normal operation process termination and resurrection messages
 	are now output regardless of the state of the verbose flag.