Merge branch '1.6'

weaveworks · Jul 9, 2016 · 791ab55 · 791ab55
2 parents bd1a9d0 + e642f36
commit 791ab55
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/router/network_router.go b/router/network_router.go
@@ -87,7 +87,6 @@ func (router *NetworkRouter) handleCapturedPacket(key PacketKey) FlowOp {
 	switch newSrcMac, conflictPeer := router.Macs.Add(srcMac, router.Ourself.Peer); {
 	case newSrcMac:
 		log.Println("Discovered local MAC", srcMac)
-
 	case conflictPeer != nil:
 		// The MAC cache has an entry for the source MAC
 		// associated with another peer.  This probably means