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

2024-10-22 08:20:21 +02:00
parent 95b15964a9 8555c200c7
commit 80ac9d34dc
2 changed files with 8 additions and 4 deletions
@@ -0,0 +1,8 @@
+<<<<<<< HEAD
+AHAHAHHAHA GOTAGAAAAAAA, alors les gentle mates
+=======
+jkerklg,eorfiopefr
+
+AHAHAHHAHA GOTAGAAAAAAA, alors les gentle mate
+>>>>>>> d6c65328bfa0b5937a6a1944aeafa12e384d5216
+>>>>>>> df64fee8be500591b0a07ea19e78f5f480ec4f0e
@@ -1,4 +0,0 @@
-jkerklg,eorfiopefr
-
-AHAHAHHAHA GOTAGAAAAAAA, alors les gentle mate
->>>>>>> d6c65328bfa0b5937a6a1944aeafa12e384d5216