fixed conflict

This commit is contained in:
lixiaopeng
2021-11-01 18:32:28 +08:00
parent 2561a5d38b
commit fe3bfb7dc3
7 changed files with 148 additions and 32 deletions

View File

@@ -61,6 +61,7 @@ dependencies {
implementation rootProject.ext.dependencies.mogo_core_utils
implementation rootProject.ext.dependencies.mogo_core_network
implementation rootProject.ext.dependencies.mogo_core_function_call
// implementation rootProject.ext.dependencies.mogo_core_res
} else {
implementation project(':modules:mogo-module-common')
implementation project(':services:mogo-service-api')
@@ -70,6 +71,7 @@ dependencies {
implementation project(':core:mogo-core-utils')
implementation project(':core:mogo-core-function-api')
implementation project(':core:mogo-core-function-call')
// implementation project(':core:mogo-core-res')
}
}