[Gradle] Fix KDoc problems after merge

zeesh49 · Jan 10, 2025 · 8817b27 · 8817b27
1 parent 93f91b6
commit 8817b27
Showing 1 changed file with 0 additions and 24 deletions.
diff --git a/...lugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinDependencyHandler.kt b/...lugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinDependencyHandler.kt
@@ -256,19 +256,7 @@ interface KotlinDependencyHandler : HasProject {
 
     /**
      * Creates a dependency to an official Kotlin library with the same version that is configured
-<<<<<<< HEAD
-<<<<<<< HEAD
-     * in [KotlinTopLevelExtensionConfig.coreLibrariesVersion].
-||||||| parent of d8f8907bc52f (fixup! [Gradle] Add public KotlinBaseExtension interface)
-     * in [KotlinTopLevelExtension.coreLibrariesVersion].
-=======
      * in [KotlinBaseExtension.coreLibrariesVersion].
->>>>>>> d8f8907bc52f (fixup! [Gradle] Add public KotlinBaseExtension interface)
-||||||| parent of 37fd28b82148 ([Gradle] Deprecated kotlinTopLevelExtensionConfig interface)
-     * in [KotlinTopLevelExtensionConfig.coreLibrariesVersion].
-=======
-     * in [KotlinTopLevelExtension.coreLibrariesVersion].
->>>>>>> 37fd28b82148 ([Gradle] Deprecated kotlinTopLevelExtensionConfig interface)
      *
      * Note: The created dependency should be manually added to this entity using other methods from this DSL:
      * ```
@@ -306,19 +294,7 @@ interface KotlinDependencyHandler : HasProject {
      * // equivalent to
      * implementation("org.jetbrains.kotlin:kotlin-reflect:2.0.0")
      * ```
-<<<<<<< HEAD
-<<<<<<< HEAD
-     * @param version dependency version or `null` to use the version defined in [KotlinTopLevelExtensionConfig.coreLibrariesVersion].
-||||||| parent of d8f8907bc52f (fixup! [Gradle] Add public KotlinBaseExtension interface)
-     * @param version dependency version or `null` to use the version defined in [KotlinTopLevelExtension.coreLibrariesVersion].
-=======
      * @param version dependency version or `null` to use the version defined in [KotlinBaseExtension.coreLibrariesVersion].
->>>>>>> d8f8907bc52f (fixup! [Gradle] Add public KotlinBaseExtension interface)
-||||||| parent of 37fd28b82148 ([Gradle] Deprecated kotlinTopLevelExtensionConfig interface)
-     * @param version dependency version or `null` to use the version defined in [KotlinTopLevelExtensionConfig.coreLibrariesVersion].
-=======
-     * @param version dependency version or `null` to use the version defined in [KotlinTopLevelExtension.coreLibrariesVersion].
->>>>>>> 37fd28b82148 ([Gradle] Deprecated kotlinTopLevelExtensionConfig interface)
      */
     fun kotlin(simpleModuleName: String, version: String?): ExternalModuleDependency