summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorEd Leafe <ed@leafe.com>2011-08-08 20:03:14 +0000
committerEd Leafe <ed@leafe.com>2011-08-08 20:03:14 +0000
commitde23e5ad63f6293060835e496363c935044480d6 (patch)
tree1ef40c91983f6f7627d194260a721635d294dffa /plugins
parent6dcea0da62e881eaeb02027ea868d49c2402209d (diff)
downloadnova-de23e5ad63f6293060835e496363c935044480d6.tar.gz
nova-de23e5ad63f6293060835e496363c935044480d6.tar.xz
nova-de23e5ad63f6293060835e496363c935044480d6.zip
cleaned up unneeded line
Diffstat (limited to 'plugins')
-rwxr-xr-xplugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost1
1 files changed, 0 insertions, 1 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost
index a28f5abfb..4028fdc7a 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost
@@ -104,7 +104,6 @@ def set_host_enabled(self, arg_dict):
return {"status": status}
-<<<<<<< TREE
def _write_config_dict(dct):
conf_file = file(config_file_path, "w")
json.dump(dct, conf_file)