From e1ff2197c085bc15afad9a6221d83e011ab48175 Mon Sep 17 00:00:00 2001
From: Marc CARRE <carre.marc@gmail.com>
Date: Thu, 4 May 2017 12:20:26 +0100
Subject: [PATCH] Fix conflict accidentally missed when merging 1.9.

---
 prog/weaver/main.go | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/prog/weaver/main.go b/prog/weaver/main.go
index f54eb5fb..fd364aa4 100644
--- a/prog/weaver/main.go
+++ b/prog/weaver/main.go
@@ -332,15 +332,7 @@ func main() {
 		dockerVersion = dockerCli.DockerVersion()
 	}
 
-<<<<<<< HEAD
-	network := ""
-	if bridgeConfig.AWSVPC {
-		network = "awsvpc"
-	}
-	checkForUpdates(dockerVersion, network)
-=======
 	checkForUpdates(dockerVersion, router)
->>>>>>> origin/1.9
 
 	observeContainers := func(o docker.ContainerObserver) {
 		if dockerCli != nil {