conflict solved :)

25300e7e · MOREAU Yanice, Maurice, Gerard · 6cef9666 · 28b57b2c · 25300e7e · 25300e7e
Commit 25300e7e authored 2 years ago by MOREAU Yanice, Maurice, Gerard
--- a/feature.txt
+++ b/feature.txt
-this is another text.
\ No newline at end of file
+this is the text I want
--- a/test2.txt
+++ b/test2.txt
+<<<<<<< HEAD
 a new text.
+=======
+I love conflict !
+>>>>>>> anewfeature