Oopies, missed u.

2012-09-24 17:56:42 -07:00
parent 9d4998da3a
commit 36f2c98d46
1 changed files with 0 additions and 2 deletions
--- 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')