Merge branch 'main' of https://github.com/Farad77/Bidule

2024-10-22 09:34:22 +04:00
parent 31d3040e3a ced5bdfeef
commit 6141a60c85
1 changed files with 0 additions and 2 deletions
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
 C'est une bonne situation ça scribe ?
 =======
 poney unijambiste
->>>>>>> 8331ff78dd43c2c192752092ee9a1a70218f6a32