Fusion de product dans develop

requirements.txt

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 altair==5.5.0
 attrs==25.3.0
 blinker==1.9.0
@@ -8,11 +9,30 @@ click==8.1.8
 colorama==0.4.6
 contourpy==1.3.2
 cycler==0.12.1
+=======
+acme==2.1.0
+altair==5.5.0
+attrs==22.2.0
+blinker==1.5
+cachetools==5.5.2
+certifi==2022.9.24
+cffi==1.17.1
+chardet==5.1.0
+charset-normalizer==2.1.1
+click==8.1.8
+ConfigArgParse==1.5.3
+configobj==5.0.8
+contourpy==1.3.2
+cryptography==38.0.4
+cycler==0.12.1
+distro==1.8.0
+>>>>>>> product
 dotenv==0.9.9
 fonttools==4.57.0
 fpdf==1.7.2
 gitdb==4.0.12
 GitPython==3.1.44
+<<<<<<< HEAD
 idna==3.10
 Jinja2==3.1.6
 jsonschema==4.23.0
@@ -48,4 +68,55 @@ tornado==6.4.2
 typing_extensions==4.13.2
 tzdata==2025.2
 urllib3==2.4.0
+=======
+httplib2==0.20.4
+idna==3.3
+Jinja2==3.1.2
+josepy==1.13.0
+jsonpatch==1.32
+jsonpointer==2.3
+jsonschema==4.10.3
+kiwisolver==1.4.8
+markdown-it-py==2.1.0
+MarkupSafe==2.1.2
+matplotlib==3.10.1
+mdurl==0.1.2
+mysql-connector-python==9.3.0
+narwhals==1.33.0
+numpy==2.2.4
+oauthlib==3.2.2
+packaging==24.2
+paho-mqtt==2.1.0
+pandas==2.2.3
+parsedatetime==2.6
+pillow==11.1.0
+protobuf==5.29.4
+pyarrow==19.0.1
+pycparser==2.22
+pydeck==0.9.1
+Pygments==2.14.0
+PyJWT==2.6.0
+pyOpenSSL==23.2.0
+pyparsing==3.0.9
+pyRFC3339==1.1
+pyrsistent==0.18.1
+pyserial==3.5
+PySimpleSOAP==1.16.2
+python-dateutil==2.9.0.post0
+python-dotenv==1.1.0
+pytz==2022.7.1
+PyYAML==6.0
+requests==2.28.1
+rich==13.3.1
+six==1.16.0
+smmap==5.0.2
+streamlit==1.44.1
+supervisor==4.2.5
+tenacity==9.1.2
+toml==0.10.2
+tornado==6.4.2
+typing_extensions==4.13.1
+tzdata==2025.2
+urllib3==1.26.12
+>>>>>>> product
 watchdog==6.0.0