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
Revert "changed index.php"

This reverts commit 0b4efdd12b5272b08bcdd642907a1c013da1b733.
Revert "Revert "changed index.php""

This reverts commit 1ecd44962b43bb11e3f3a8863da7afec6f872c8b.
Updating file php
Revert "Revert "Revert "changed index.php"""

This reverts commit a2a7649c929004f5655739be7ec150e2ef124c61.
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
Merge branch 'master' of https://github.com/cumga007/codeandmore_github
commit branch

commit branch
test speed

test speed
Merge remote-tracking branch 'origin/test-new-branch' into Lien-branch
Merge remote-tracking branch 'origin/Lien-branch' into test-new-branch