Skip to content
Snippets Groups Projects
Commit 08ebf929 authored by Robin MALLINGER's avatar Robin MALLINGER
Browse files

conflit resolu

parents de27960a 86ef455b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
alice.txt
+ 2
− 1
View file @ 08ebf929
......@@ -2,4 +2,5 @@ test cours tp git bob was here
mod1
mod2
mod3
testtest
testtes
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment