[trac438] remove conflict marker from Changelog

2025-09-05 00:15:17 +00:00 · 2011-02-03 11:14:59 +01:00
parent 18964f9374
commit ce77ca4662
1 changed files with 0 additions and 1 deletions
--- a/1
+++ b/1
@@ -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.