Commit e8c9b648 authored by Andres Maldonado's avatar Andres Maldonado
Browse files

Merge branch 'sheeeebaaaannnng' into 'master'


See merge request picasoft/formations/A18/tp-v2!1
parents 7511700b 9ac0ea3a
git checkout merge_simple
git checkout merge_conflit
git checkout rebase_simple
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