core: fix wrong rebase

Fixes: 25aaaab3b7
This commit is contained in:
Thomas Haller 2016-05-13 19:28:04 +02:00
parent 25aaaab3b7
commit dab2d46aa2

View file

@ -846,7 +846,7 @@ remove_device (NMManager *self,
nm_device_get_iface (device), allow_unmanage, nm_device_get_managed (device, FALSE));
if (allow_unmanage && nm_device_get_managed (device, FALSE)) {
gboolean unmanage = TRUE;
unmanage = TRUE;
if (!quitting) {
/* the device is already gone. Unmanage it. */