From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 23 Jun 2022 16:51:44 +0000 (+0200)
Subject: fix conflict
X-Git-Tag: 2.7.1~38
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8f1cdf364a30dd36c0ae86855f0725a19643fadb;p=teleforma.git

fix conflict
---

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()