cleanup: removed a merge conflict mark, which seems to be a leftover.

should be trivial, skipping review.


git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@3972 e5f2f494-b856-4b98-b285-d166d9295462

ChangeLog

@@ -46,7 +46,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.