resolution conflits

This commit is contained in:
Solène 2025-01-26 14:20:53 +01:00
parent cb7604d9a4
commit c716ec8876
30 changed files with 284 additions and 1854 deletions

4
.gitignore vendored Normal file
View file

@ -0,0 +1,4 @@
__pycache__/
.vscode/
.venv
.DS_Store