Skip to content

Commit

Permalink
Fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
mpilquist committed Jul 14, 2023
1 parent c5a57f4 commit bd59b9c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build.sbt
Expand Up @@ -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(
Expand Down

0 comments on commit bd59b9c

Please sign in to comment.