Merge branch 'master' of https://github.com/xFahran/Java

Gérondal Fahran · Gérondal Fahran · commit 8e121a28813d · 2025-05-21T09:39:11.000+02:00
diff --git a/readme.md b/readme.md
@@ -1 +1,5 @@
-coucou hermi
+<<<<<<< HEAD
+coucou hermi
+=======
+Coucou hermi
+>>>>>>> db4d435356011596afb8b5448951445f990a9d64
