Merge branch 'master' into zaniBranch
Hahaha
Merge branch 'master' of https://github.com/pcarpe12/GIT_Carpe_Hoguin_Sylla_Zaninetti_QLog
Test delete
premier commit dans branchZaniBis
message
deuxieme commit dans ma branche
Merge branch 'branchePierrot'
Commit 1 et 2
Merge branch 'master' of https://github.com/pcarpe12/GIT_Carpe_Hoguin_Sylla_Zaninetti_QLog
removed testpierrot
Merge branch 'branchZaniBis'
Merge branch 'mybranch'
Merge branch 'master' of https://github.com/pcarpe12/GIT_Carpe_Hoguin_Sylla_Zaninetti_QLog
commit 3
Merge branch 'master' of https://github.com/pcarpe12/GIT_Carpe_Hoguin_Sylla_Zaninetti_QLog

Conflicts:
	coucou.txt
	src/ModifiedNameDoc.txt
commit mille