message en vrac
ajout fichier clotilde.txt.txt
ajout fichier clotilde.txt.txt
commit pre-merge
resolution conflit
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/XavCamp/formationGit

Conflicts:
	README.md
pause