#
untrack inc.globalvariables.php
Merge branch 'master' of https://github.com/raihansikder/fieldportal-site-repo

Conflicts:
	.settings/.jsdtscope
	.settings/org.eclipse.php.core.prefs