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

[trac438] remove conflict marker from Changelog

Jelte Jansen 14 years ago
parent
18964f9374
commit
ce77ca4662
1 changed files with 0 additions and 1 deletions
Unified View Show Diff Stats
  1. 0 1
      ChangeLog

+ 0 - 1
ChangeLog
View File 

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