Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
Kea
Commits
ce77ca46
Commit
ce77ca46
authored
Feb 03, 2011
by
Jelte Jansen
Browse files
[trac438] remove conflict marker from Changelog
parent
18964f93
Changes
1
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
ce77ca46
...
...
@@ -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.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment