Conflict test

mọi người cùng nhau edit và commit sync file congnguyentan.php lên xem
có xuất hiện conflict ko
testing conflict

testing conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	congnguyentan.php
Merge branch 'master' of https://github.com/cumga007/codeandmore_github

Conflicts:
	congnguyentan.php
Merge branch 'master' of https://github.com/cumga007/codeandmore_github