Commit b5ff3f23 authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

cleanup: removed a merge conflict mark, which seems to be a leftover.

should be trivial, skipping review.

git-svn-id: svn:// e5f2f494-b856-4b98-b285-d166d9295462
parent a4fbb679
......@@ -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.
Supports Markdown
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