diff --git a/AUTHORS b/AUTHORS index 5f80284..775f066 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,2 +1,6 @@ David Barroso +<<<<<<< HEAD Elisa Jasinska +======= +Elisa Jasinska +>>>>>>> master diff --git a/ansible/napalm_install_config b/ansible/napalm_install_config index a31f963..cfe7c27 100644 --- a/ansible/napalm_install_config +++ b/ansible/napalm_install_config @@ -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: