Commit ce77ca46 authored by Jelte Jansen's avatar Jelte Jansen
Browse files

[trac438] remove conflict marker from Changelog

parent 18964f93
......@@ -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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment