[svn] commit: r3972 - /trunk/ChangeLog

[BIND 10 source code commits]

Author: jinmei
Date: Wed Dec 22 19:49:17 2010
New Revision: 3972

Log:
cleanup: removed a merge conflict mark, which seems to be a leftover.
should be trivial, skipping review.

Modified:
    trunk/ChangeLog

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Wed Dec 22 19:49:17 2010
@@ -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.