conflit1

1 month ago · a7ec9ee118
1 changed files with 1 additions and 6 deletions
--- a/7
+++ b/7
@ -1,6 +1 @@
-Hello World!
-plus plus ma contribution sur ce projet
-
-
-
-qlkjdhlqkjglkdfjqgldkfjgqhldfkjghqmdfkdfjmqfkmdqghmdfq
+Hello people!