merge conflicts

square · yschimke · May 21, 2023 · May 21, 2023 · May 21, 2023 · Dec 31, 2024
commit 3a04d6855b75f2ee9901b97d17d66e312da5db86
diff --git a/okhttp/build.gradle.kts b/okhttp/build.gradle.kts
@@ -97,6 +97,7 @@ kotlin {
         compileOnly(libs.conscrypt.openjdk)
         implementation(libs.androidx.annotation)
         implementation(libs.androidx.startup.runtime)
+        implementation(libs.androidx.tracing.ktx)
       }
     }