Home Explore Help
Sign In
zorun
/
kea
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

JINMEI Tatuya 14 years ago
parent
a4fbb679ee
commit
b5ff3f23c1
1 changed files with 0 additions and 1 deletions
Unified View Show Diff Stats
  1. 0 1
      ChangeLog

+ 0 - 1
ChangeLog
View File 

@@ -46,7 +46,6 @@
 
 	for root zone was added.
 
 	for root zone was added.
 
 	(Trac #85, svn r3836)
 
 	(Trac #85, svn r3836)
 
 
 
->>>>>>> .merge-right.r3894
 
   127.  [bug]       stephen
 
   127.  [bug]       stephen
 
 	During normal operation process termination and resurrection messages
 
 	During normal operation process termination and resurrection messages
 
 	are now output regardless of the state of the verbose flag.
 
 	are now output regardless of the state of the verbose flag.