[[!comment format=mdwn
 username="joey"
 subject="""comment 1"""
 date="2017-01-01T21:29:52Z"
 content="""
I have reverted that change for now.

I don't think the /usr/src/propellor/ merge has anything specific to do
with the changelog, so there is probably a general case where that merge
fails to work. I guess it involves a file's type changing.
"""]]
