Browse Source

[trac438] remove conflict marker from Changelog

Jelte Jansen 14 years ago
parent
commit
ce77ca4662
1 changed files with 0 additions and 1 deletions
  1. 0 1
      ChangeLog

+ 0 - 1
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.