An error occurred while fetching folder content.
user avatar
Merge branch 'kt-master'
Dmitrii Gridin authored
# Conflicts:
#	community/android/android-test-framework/testSrc/com/android/tools/idea/testing/AndroidGradleTestUtils.kt
#	community/plugins/kotlin/base/fir/analysis-api-providers/src/org/jetbrains/kotlin/idea/base/fir/analysisApiProviders/FirIdeKotlinModificationTrackerFactory.kt
#	community/plugins/kotlin/gradle/multiplatform-tests/test/org/jetbrains/kotlin/gradle/idea/importing/multiplatformTests/KotlinMppCompilerPluginImportingTests.kt
#	community/plugins/kotlin/gradle/multiplatform-tests/test/org/jetbrains/kotlin/gradle/idea/importing/multiplatformTests/KotlinMppTierOneCasesImportingTests.kt
#	community/plugins/kotlin/uast/uast-kotlin-base/tests/test/org/jetbrains/uast/test/common/kotlin/LightClassBehaviorTestBase.kt

GitOrigin-RevId: 979b640ee10f796e0263c5a724d383592670e77e
9f0e8125
Name Last commit Last update