SvenRoederer

small story, how to easily fix the conflict of branch "for-Hedy-1.0.c_change_uplink" after merging "Hedy-1.0.x_backport-tunneldigger"

after I found the offending commit, I just did:

> rebase -i 1d4eda3d4^

this gave

> pick 1d4eda3d4 update links to https
pick 2e16cca9e network-defaults: setup a ffuplink related options by default