I added a news entry, I was trying to ask around on how to get the complete diff as I couldn't figure out what was conflicting from the diff that launchpad gives below, but someone on irc says it merges fine locally
<LarstiQ> mgrandi: merge already looks fine to me, so just add an entry to that file
<mgrandi> isn't the merge conflicted?
<mgrandi> thats what it says to me on launchpad
<LarstiQ> mgrandi: locally it was fine, that beats what launchpad says
I added a news entry, I was trying to ask around on how to get the complete diff as I couldn't figure out what was conflicting from the diff that launchpad gives below, but someone on irc says it merges fine locally
<LarstiQ> mgrandi: merge already looks fine to me, so just add an entry to that file
<mgrandi> isn't the merge conflicted?
<mgrandi> thats what it says to me on launchpad
<LarstiQ> mgrandi: locally it was fine, that beats what launchpad says
so I pushed the update with the news entry.