ifupdown: fix up a bad rebase
authorLubomir Rintel <lkundrak@v3.sk>
Mon, 14 Mar 2016 15:39:43 +0000 (16:39 +0100)
committerLubomir Rintel <lkundrak@v3.sk>
Mon, 14 Mar 2016 15:39:43 +0000 (16:39 +0100)
commite4aaa48b8297359987a02e5bab9e119939237638
treee1e0be4366c22bf420e4afeecc7bf9317f09f335
parentad8251e3a49b9664a059325556396cbac42c759e
ifupdown: fix up a bad rebase

Fixes: 0cb45af97761e47d97c8f76346f7f1bef46ce2cb
src/settings/plugins/ifupdown/nm-ifupdown-connection.c