summaryrefslogtreecommitdiff
path: root/doc/todo/Merging_from___47__usr__47__src__47__propellor_broken_now_CHANGELOG_not_a_symlink/comment_1_62b47d7c0530c2988b7e6e998878b920._comment
blob: 886c2534fb7475a6ad3a78fe069e2734265f6acf (plain)
1
2
3
4
5
6
7
8
9
10
11
[[!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.
"""]]