From bd59b9c7e04f258e41ed7836c2be2c6d71f4c915 Mon Sep 17 00:00:00 2001
From: mpilquist <mpilquist@gmail.com>
Date: Fri, 14 Jul 2023 11:58:59 -0400
Subject: [PATCH] Fix merge conflict

---
 build.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index ff22286a..4d398b37 100644
--- a/build.sbt
+++ b/build.sbt
@@ -190,7 +190,7 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
     libraryDependencies ++= Seq(
       "org.typelevel" %% "otel4s-java" % otel4sVersion,
       "io.opentelemetry" % "opentelemetry-exporter-otlp" % openTelemetryVersion % Runtime,
-      "io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % s"${openTelemetryVersion}-alpha" % Runtime
+      "io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % openTelemetryVersion % Runtime
     ),
     Test / fork := true,
     javaOptions ++= Seq(