From 268cdf3458849eb7be41253c38a86c68bbddde59 Mon Sep 17 00:00:00 2001
From: Vlastimil Holer <vlastimil.holer@gmail.com>
Date: Wed, 19 Dec 2012 18:12:37 +0100
Subject: Remove conflicting merge block

---
 cloudinit/sources/__init__.py | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'cloudinit/sources')

diff --git a/cloudinit/sources/__init__.py b/cloudinit/sources/__init__.py
index f98493de..0bad4c8b 100644
--- a/cloudinit/sources/__init__.py
+++ b/cloudinit/sources/__init__.py
@@ -163,7 +163,6 @@ class DataSource(object):
             # make up a hostname (LP: #475354) in format ip-xx.xx.xx.xx
             lhost = self.metadata['local-hostname']
             if util.is_ipv4(lhost):
-<<<<<<< TREE
                 toks = []
                 if resolve_ip:
                     toks = util.gethostbyaddr(lhost)
@@ -172,9 +171,6 @@ class DataSource(object):
                     toks = toks.split('.')
                 else:
                     toks = ["ip-%s" % lhost.replace(".", "-")]
-=======
-                toks = ["ip-%s" % lhost.replace(".", "-")]
->>>>>>> MERGE-SOURCE
             else:
                 toks = lhost.split(".")
 
-- 
cgit v1.2.3