From dab2d46aa2f44da6334762fbbf86bee276dd4471 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 13 May 2016 19:28:04 +0200
Subject: [PATCH] core: fix wrong rebase

Fixes: 25aaaab3b7ee677f494e8b3b3c310294137626a1
---
 src/nm-manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nm-manager.c b/src/nm-manager.c
index fc87ab9af3..ccf130a2c6 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -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. */