Résolution des conflits Git et nettoyage du code

2025-05-07 09:41:52 +02:00
parent bca5dd14d3
commit 12a202c2b2
7 changed files with 12 additions and 11 deletions
--- a/domo91.py
+++ b/domo91.py
@@ -533,11 +533,10 @@ if st.session_state["authenticated"]:
        except Exception as e:
            st.error(f"Erreur chargement des connexions : {e}")

-<<<<<<< HEAD
-        except Exception as err:  # petit bug dans ton except ici (tu avais écrit "except exception")
+
+        except Exception as err:
            st.error(f"Erreur MySQL : {err}")

-=======
-        except exception as err:
+        except Exception as err:
            st.error(f"Erreur MySQL : {err}")
->>>>>>> product
+