From 3bd596cefaf7e60b8d83c083a615b79dfa0ce848 Mon Sep 17 00:00:00 2001
From: Kiewan Villatel <kiewan@langchain.dev>
Date: Thu, 28 May 2026 10:52:13 +0200
Subject: [PATCH] Resolve merge conflicts in ci, stats, and example build

---
 .github/workflows/publish-sonatype.yml  |  3 ---
 .stats.yml                              |  7 -------
 langsmith-java-example/build.gradle.kts | 10 ----------
 3 files changed, 20 deletions(-)

diff --git a/.github/workflows/publish-sonatype.yml b/.github/workflows/publish-sonatype.yml
index 9c77f631..e355cc7c 100644
--- a/.github/workflows/publish-sonatype.yml
+++ b/.github/workflows/publish-sonatype.yml
@@ -4,15 +4,12 @@ name: Publish Sonatype
 on:
   workflow_dispatch:
 
-<<<<<<< HEAD
-=======
   release:
     types: [published]
 
 permissions:
   contents: read
 
->>>>>>> f63fb541 (Apply custom code)
 jobs:
   publish:
     name: publish
diff --git a/.stats.yml b/.stats.yml
index d3ae68b0..7c2d10e0 100644
--- a/.stats.yml
+++ b/.stats.yml
@@ -1,8 +1 @@
-<<<<<<< HEAD
 configured_endpoints: 125
-=======
-configured_endpoints: 122
-openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/langsmith/langsmith-api-a1f32beb58f562c9a02180625ca18e4884b20a633a6bd51aabae6eb4fd2e54ed.yml
-openapi_spec_hash: 5f8292d60c37b5dc0c8cc1e7f691c971
-config_hash: 57e1c5d2f7d3f4c50121dda73a181670
->>>>>>> f63fb541 (Apply custom code)
diff --git a/langsmith-java-example/build.gradle.kts b/langsmith-java-example/build.gradle.kts
index e1b9dcf3..18b1f1ae 100644
--- a/langsmith-java-example/build.gradle.kts
+++ b/langsmith-java-example/build.gradle.kts
@@ -1,8 +1,4 @@
 plugins {
-<<<<<<< HEAD
-    id("langchain.java")
-=======
->>>>>>> f63fb541 (Apply custom code)
     application
     kotlin("jvm")
     id("org.jetbrains.kotlin.plugin.spring") version "2.1.20"
@@ -13,16 +9,10 @@ repositories {
     mavenCentral()
 }
 
-<<<<<<< HEAD
-dependencies {
-    implementation(project(":langsmith-java-core"))
-    implementation(project(":langsmith-java-client-okhttp"))
-=======
 // Align with Kotlin JVM target (Kotlin plugin applies Java plugin; keep targets consistent)
 java {
     sourceCompatibility = JavaVersion.VERSION_21
     targetCompatibility = JavaVersion.VERSION_21
->>>>>>> f63fb541 (Apply custom code)
 }
 
 dependencies {