From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 23 Jun 2022 16:48:01 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 2.7.1~39
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b0a1a9ac46d3de2c0258a1a368a0b739016f8a5e;p=teleforma.git

Merge branch 'dev'
---

b0a1a9ac46d3de2c0258a1a368a0b739016f8a5e
diff --cc teleforma/management/commands/teleforma-export-wifi-accounts.py
index db7b760c,23984144..c4b15f75
--- a/teleforma/management/commands/teleforma-export-wifi-accounts.py
+++ b/teleforma/management/commands/teleforma-export-wifi-accounts.py
@@@ -42,6 -39,6 +39,10 @@@ class Command(BaseCommand)
                      data.append(p.wifi_pass)
                      data.append('\n')
                      s = ','.join(data)
++<<<<<<< HEAD
 +                    f.write(s)
++=======
+         f.write(s)
++>>>>>>> dev
          f.close()