Merge branch 'master' of git.rentelwifi.com:javier/scrapper-portabilidad

mbilling/functions.py

@@ -145,7 +145,11 @@ def create_user(phone_number: str, name: str, surname: str, password: str = None
                 "UPDATE mbilling.pkg_user SET typepaid=1, creditlimit=30 WHERE username=?",
                 (phone_number,)
             )
+<<<<<<< HEAD
         cnx.commit()
+=======
+
+>>>>>>> 3e2c103a5b4bac2248e7e8965a1a2784d9fa6be9
     return password