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

2024-10-22 09:34:43 +04:00
parent 6141a60c85 db9f9be639
commit 829037d271
2 changed files with 6 additions and 2 deletions
@@ -1 +1,5 @@
-cours github expernet
+<<<<<<< HEAD
+LA KPOP C'EST NUL
+=======
+cours github expernet
+>>>>>>> 8331ff78dd43c2c192752092ee9a1a70218f6a32
@@ -1 +1 @@
-Test push github
+tomy j'ai pirater ton fichier texte