Skip to content
Snippets Groups Projects
Commit e25f37dd authored by BARETH Aymeric's avatar BARETH Aymeric
Browse files

fix: résolution du conflit sur alice.txt par Bob -> on garde la version de Bob

parents 9268b5bf 74edd7cd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 2 deletions
alice.txt
+ 0
− 2
View file @ e25f37dd
Bob was here. Bob was here.
Alice modifié
55 lignes
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment