BIND 10 trac438, updated. ce77ca466280e9c63f5c47c001cd3e98381cd56a [trac438] remove conflict marker from Changelog

[BIND 10 source code commits]

The branch, trac438 has been updated
       via  ce77ca466280e9c63f5c47c001cd3e98381cd56a (commit)
      from  18964f9374531c8f131065dcd53aefd998e080ac (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ce77ca466280e9c63f5c47c001cd3e98381cd56a
Author: Jelte Jansen <jelte at isc.org>
Date:   Thu Feb 3 11:14:59 2011 +0100

    [trac438] remove conflict marker from Changelog

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 02f1496..c0b1584 100644
--- 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.