new laptop

add one more line
old laptop

add 1 line, conflict?
Merge branch 'origin/dev-info' into dev-info

Conflicts:
	DeveloperInfo.md
say hi

Hi, Nguyen!
Merge and ignore

using WinMerge
Merge branch 'origin/dev-info' into dev-info

Try one more!
test conflict
test merge
Merge branch 'origin/dev-info' into dev-info

conflict solved
Merge pull request #3 from nntung/dev-info

Dev info. Resolve conflict by using WinMerge.