summaryrefslogtreecommitdiff
path: root/cloudinit/mergers
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2013-03-07 17:13:05 -0500
committerScott Moser <smoser@ubuntu.com>2013-03-07 17:13:05 -0500
commit5da3984c2ca9e94b2483ab89ecdb5c93b5afb9f8 (patch)
tree10a659fd2664e42d2da1ce68d97eff5d6c112561 /cloudinit/mergers
parentaae7fe638f61aaf02c6579d5b691a8641455c875 (diff)
downloadcloud-init-git-5da3984c2ca9e94b2483ab89ecdb5c93b5afb9f8.tar.gz
more pep8/pylint. all clean now
Diffstat (limited to 'cloudinit/mergers')
-rw-r--r--cloudinit/mergers/__init__.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/cloudinit/mergers/__init__.py b/cloudinit/mergers/__init__.py
index ac16f143..e1ff57ba 100644
--- a/cloudinit/mergers/__init__.py
+++ b/cloudinit/mergers/__init__.py
@@ -152,5 +152,3 @@ def construct(parsed_mergers):
for (attr, opts) in mergers_to_be:
mergers.append(attr(root, opts))
return root
-
-