Skip to content

GitLab

Commit 31583527 authored by GROSPELLIER Lucas's avatar GROSPELLIER Lucas
Browse files

Merge branch 'master' of https://gitlab.telecomnancy.univ-lorraine.fr/Olivier.Barreau/tp-git 

test	î
parents b2465bc1 42dbdbc5
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
recipe_soup.txt
View file @ 31583527
......@@ -34,3 +34,6 @@ This is the modification after the revert
Exercice 3 - Modif to create conflict
Exercice 3 - Modif for conflict 2
Exercice 4 - Modif for branch
Modif to see remote branch
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment