summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cloudinit/distros/rhel.py2
1 files changed, 0 insertions, 2 deletions
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')