Skip to content

S
ShenghuoquanBusiness
Commit a8a9538d authored by shiyl's avatar shiyl
Browse files
Options

修改代码冲突问题

parent 0f34baca
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 6 deletions
CommonLib/BCommon/src/main/java/com/yidian/bcommon/constant/AppConfig.kt
View file @ a8a9538d
...@@ -69,15 +69,10 @@ class AppConfig { ...@@ -69,15 +69,10 @@ class AppConfig {
// 用户协议 // 用户协议
const val userProtocol = "http://merchant.jwshq.cn/home/agreement" const val userProtocol = "http://merchant.jwshq.cn/home/agreement"
<<<<<<< HEAD:CommonLib/BCommon/src/main/java/com/yidian/bcommon/constant/AppConfig.kt
// 隐私政策 // 隐私政策
const val privacyPolicy = "http://merchant.jwshq.cn/home/policy" const val privacyPolicy = "http://merchant.jwshq.cn/home/policy"
=======
// 隐私政策
const val privacyPolicyStatement = "http://merchant.jwshq.cn/home/policy"
>>>>>>> dev_commodity:CommonLib/Common/src/main/java/com/yidian/common/AppConfig.kt
// 我的钱包 - 常见问题 // 我的钱包 - 常见问题
const val commonProblem = "https://www.appgc.cn/plugins/privacy/content?type=privacy&appId=1080334&ver=210601" const val commonProblem = "https://www.appgc.cn/plugins/privacy/content?type=privacy&appId=1080334&ver=210601"
......
www @ 69e8a173
Subproject commit 718e7925f83d97bf4386f667661eb2f3b072bd87 Subproject commit 69e8a173a6f1d5d9ec3b7b03f54be06c38fbe6cd
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment