tesdt
first commit
Merge branch 'master' of https://github.com/cokacola1978/atexo-git
file2.txt
commit lez
modif other file
commit LEZ
branche LHA
commit lez
com
Merge branch 'master' into LHA
test kbe
Merge branch 'master' of https://github.com/cokacola1978/atexo-git

Conflicts:
	Test.php