new branch
test2.php
test conflit
Test conflit
test
test
test
test
arg
a
Merge branch 'test' of https://github.com/BUONJG/gittest into test

Conflicts:
	test2.php
a
conflit
test conflit 2
test conflit
resolve conflit
a
a
1
Merge branch 'test' of https://github.com/BUONJG/gittest into test

Conflicts:
	test2.php