Rejected commit: Default
Rejected commit: Default
Rejected commit: Default
Rejected commit: Default
Rejected commit: Default
Rejected commit: Default
Rejected commit: Default
Merge remote-tracking branch 'origin/master'

Conflicts:
	XYComPayMiddleWare/src/com/xy/xypay/MainActivity.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	XYComPayMiddleWare/res/layout/activity_main.xml
	XYComPayMiddleWare/src/com/xy/xypay/utils/RPCService.java
Rejected commit: Default