GitLab

# Conflicts:
#	GameSDK_API/src/main/assets/dwg_version_config.json
#	GameSDK_Channels/GameSDK_Channel_Main_Api/src/main/java/com/dwg/sdk/main/DWSdkControl.java
#	GameSDK_Channels/GameSDK_Channel_Main_Api/src/main/java/com/dwg/sdk/main/bean/login/RealNameBean.java
#	GameSDK_Channels/GameSDK_Channel_Main_Api/src/main/java/com/dwg/sdk/main/bean/parse/OrderBean.java
#	GameSDK_Channels/GameSDK_Channel_Main_Api/src/main/java/com/dwg/sdk/main/cache/InitCache.java
#	GameSDK_Channels/GameSDK_Channel_Main_Api/src/main/java/com/dwg/sdk/main/method/MBaseNetMethod.java
#	GameSDK_Channels/GameSDK_Channel_Main_Api/src/main/java/com/dwg/sdk/main/method/MBindPhone.java
#	GameSDK_Channels/GameSDK_Channel_Main_Api/src/main/java/com/dwg/sdk/main/method/MCallBackManager.java
#	GameSDK_Channels/GameSDK_Channel_Main_Api/src/main/java/com/dwg/sdk/main/method/MInitSDK.java
#	GameSDK_Channels/GameSDK_Channel_Main_Api/src/main/java/com/dwg/sdk/main/method/MLogin.java
#	GameSDK_Channels/GameSDK_Channel_Main_Api/src/main/java/com/dwg/sdk/main/method/MOrder.java
#	GameSDK_Channels/GameSDK_Channel_Main_Api/src/main/java/com/dwg/sdk/main/method/MRealName.java
#	GameSDK_Channels/GameSDK_Channel_Main_Api/src/main/java/com/dwg/sdk/main/mvp/model/LoginModel.java
#	GameSDK_Channels/GameSDK_Channel_Main_Api/src/main/java/com/dwg/sdk/main/mvp/model/PayModel.java
#	GameSDK_Channels/GameSDK_Channel_Main_Api/src/main/java/com/dwg/sdk/main/mvp/presenter/PayPresenter.java
#	GameSDK_Channels/GameSDK_Channel_Main_Api/src/main/java/com/dwg/sdk/main/mvp/ui/activity/PayActivity.java
#	app/src/main/AndroidManifest.xml
#	build.gradle
#	gradle.properties

# Conflicts:
#	GameSDK_API/src/main/assets/dwg_version_config.json
#	GameSDK_Channels/GameSDK_Channel_Main_Native/resources/release/layout/abcyx_layout_bottom_tip_bar.xml
#	GameSDK_Channels/GameSDK_Channel_Main_Native/resources/release/layout/abcyx_register_agreement_bar.xml
#	GameSDK_Channels/GameSDK_Channel_Main_Native/resources/release/layout/abcyx_register_login_bottom_bar.xml
#	GameSDK_Channels/GameSDK_Channel_Main_Native/resources/release/values/strings.xml
#	GameSDK_Channels/GameSDK_Channel_Main_Native/src/main/java/com/dwg/sdk/main/mvp/ui/fragment/login/BaseRegisterFragment.java
#	GameSDK_Channels/GameSDK_Channel_Main_Native/src/main/java/com/dwg/sdk/main/mvp/ui/fragment/login/BindPhoneInLoginFragment.java
#	GameSDK_Channels/GameSDK_Channel_Main_Native/src/main/java/com/dwg/sdk/main/mvp/ui/fragment/login/RealNameInLoginFragment.java
#	build.gradle

# Conflicts:
#	GameSDK_API/src/main/assets/dwg_version_config.json
#	app/src/main/AndroidManifest.xml
#	build.gradle
#	gradle.properties