Merge branch 'master' into 0.2

Conflicts:
	AUTHORS
This commit is contained in:
David Barroso committed 2015-10-01 13:14:58 +02:00
commit 7a3849afd9
2 files changed
+5 -1

No files matched your search

+4
View File
@@ -1,2 +1,6 @@
David Barroso <dbarroso@spotify.com>
<<<<<<< HEAD
Elisa Jasinska <elisa@bigwaveit.org>
=======
Elisa Jasinska <elisa@bigwaveit.com>
>>>>>>> master
+1 -1
View File
@@ -141,7 +141,7 @@ def main():
else:
device.load_merge_candidate(filename=config_file)
diff = device.compare_config()
diff = device.compare_config().encode('utf-8')
changed = len(diff) > 0
if diff_file is not None: