diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-09-24 17:56:42 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-09-24 17:56:42 -0700 |
| commit | c780ad5898f54741037ad66c28c3423aa0495fba (patch) | |
| tree | b90da26f4a7143c213ee8ffcae59af9516385b96 /cloudinit/distros | |
| parent | ebd83a036cd94d856c2cd100202c6fb4ca287ce1 (diff) | |
| download | vyos-cloud-init-c780ad5898f54741037ad66c28c3423aa0495fba.tar.gz vyos-cloud-init-c780ad5898f54741037ad66c28c3423aa0495fba.zip | |
Oopies, missed u.
Diffstat (limited to 'cloudinit/distros')
| -rw-r--r-- | cloudinit/distros/rhel.py | 2 |
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') |