From cd94c37f5d3f1c901002d44b9a17b29f68147e24 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 18 Oct 2016 14:09:31 -0700
Subject: [PATCH] Fix merge error (missing Network.labels attribute)

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/network.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compose/network.py b/compose/network.py
index 00d68aa4..e581a4fe 100644
--- a/compose/network.py
+++ b/compose/network.py
@@ -26,6 +26,7 @@ class Network(object):
         self.external_name = external_name
         self.internal = internal
         self.enable_ipv6 = enable_ipv6
+        self.labels = labels
 
     def ensure(self):
         if self.external_name: