Skip to content
Snippets Groups Projects
Commit 28b57b2c authored by MOREAU Yanice, Maurice, Gerard's avatar MOREAU Yanice, Maurice, Gerard
Browse files

change in feature2

parent a1565f44
Branches feature2
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
feature.txt 0 → 100644
+ 1
− 0
View file @ 28b57b2c
this is a text
\ No newline at end of file
test2.txt
+ 4
− 0
View file @ 28b57b2c
<<<<<<< HEAD
a new text.
=======
I love conflict !
>>>>>>> anewfeature
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment