From c780ad5898f54741037ad66c28c3423aa0495fba Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Mon, 24 Sep 2012 17:56:42 -0700
Subject: Oopies, missed u.

---
 cloudinit/distros/rhel.py | 2 --
 1 file changed, 2 deletions(-)

(limited to 'cloudinit/distros')

diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py
index 67d80bf4..1ea7952b 100644
--- a/cloudinit/distros/rhel.py
+++ b/cloudinit/distros/rhel.py
@@ -144,8 +144,6 @@ class Distro(distros.Distro):
             if not exists:
                 lines.insert(0, _make_header())
             util.write_file(fn, "\n".join(lines), 0644)
-=======
->>>>>>> MERGE-SOURCE
 
     def set_hostname(self, hostname):
         self._write_hostname(hostname, '/etc/sysconfig/network')
-- 
cgit v1.2.3