# Conflicts: # gradle/commonStaticAnalysis.gradle |
||
|---|---|---|
| .. | ||
| apiGenerator.gradle | ||
| apiGeneratorKotlinServer.gradle | ||
| applicationFileNaming.gradle | ||
| commonStaticAnalysis.gradle | ||
| installGitHooks.gradle | ||
| staticAnalysis.gradle | ||
| stringGenerator.gradle | ||
# Conflicts: # gradle/commonStaticAnalysis.gradle |
||
|---|---|---|
| .. | ||
| apiGenerator.gradle | ||
| apiGeneratorKotlinServer.gradle | ||
| applicationFileNaming.gradle | ||
| commonStaticAnalysis.gradle | ||
| installGitHooks.gradle | ||
| staticAnalysis.gradle | ||
| stringGenerator.gradle | ||