Merge branch 'master' of C:\xampp\htdocs\git\his with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
them khochan_thuoc_khangsinh.php
15/4
Merge remote-tracking branch 'origin/master'

Conflicts:
	modules/appointment_scheduler/appt_show.php
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	modules/laboratory/labor_test_request_admin_duonghuyet.php
L2