From 8f1cdf364a30dd36c0ae86855f0725a19643fadb Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 23 Jun 2022 18:51:44 +0200 Subject: [PATCH] fix conflict --- .../management/commands/teleforma-export-wifi-accounts.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/teleforma/management/commands/teleforma-export-wifi-accounts.py b/teleforma/management/commands/teleforma-export-wifi-accounts.py index c4b15f75..23984144 100644 --- a/teleforma/management/commands/teleforma-export-wifi-accounts.py +++ b/teleforma/management/commands/teleforma-export-wifi-accounts.py @@ -39,10 +39,6 @@ class Command(BaseCommand): data.append(p.wifi_pass) data.append('\n') s = ','.join(data) -<<<<<<< HEAD - f.write(s) -======= f.write(s) ->>>>>>> dev f.close() -- 2.39.5