New changelist
github2
github2
github2
Merge branch 'develop' of https://github.com/cbzsda/test into develop
github2
Merge branch 'develop' of C:\web\sites\github1 with conflicts.
github2
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	test2.php
github2
Merge remote-tracking branch 'origin/develop' into develop
New changelist
github2
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	test2.php
github2
github2
github2
github2
github2
New changelist