fix conflict

diff --git a/teleforma/management/commands/teleforma-export-wifi-accounts.py b/teleforma/management/commands/teleforma-export-wifi-accounts.py
index c4b15f75d767410836120c8c915c02914b24c394..23984144960b7355e676530474adaebfcd4d0626 100644 (file)
--- 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()