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

2024-10-22 07:41:07 +02:00
parent 6d6942a4dc ef092673e1
commit 04e332a91a
2 changed files with 6 additions and 2 deletions
@@ -1 +1,5 @@
-AHAHAHHAHA GOTAGAAAAAAA, alors les gentle mate
+<<<<<<< HEAD
 jkerklg,eorfiopefr
 =======
 AHAHAHHAHA GOTAGAAAAAAA, alors les gentle mate
 >>>>>>> d6c65328bfa0b5937a6a1944aeafa12e384d5216
@@ -1 +1 @@
-Add Text Ludovic.
+Add Tefto Ludovic.