From 7f3c1168c3c288f77f6a553438219e41a63ffa5d Mon Sep 17 00:00:00 2001
From: siri-varma <siri.varma@outlook.com>
Date: Tue, 12 Aug 2025 12:03:17 -0700
Subject: [PATCH] remove conflict

Signed-off-by: siri-varma <siri.varma@outlook.com>
---
 examples/pom.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/examples/pom.xml b/examples/pom.xml
index 6bf4a7b61..ed9f8cf86 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -22,12 +22,8 @@
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <spotbugs.fail>false</spotbugs.fail>
-<<<<<<< HEAD
-    <opentelemetry.version>0.14.0</opentelemetry.version>
-=======
     <opentelemetry.version>1.41.0</opentelemetry.version>
     <zipkin.version>3.4.0</zipkin.version>
->>>>>>> 3a8fd611 (Ensure OTEL version from examples aligns with SDK and ITs (#1403))
   </properties>
 
   <dependencies>
@@ -88,8 +84,6 @@
       <version>${opentelemetry.version}</version>
     </dependency>
     <dependency>
-<<<<<<< HEAD
-=======
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-exporter-zipkin</artifactId>
       <version>${opentelemetry.version}</version>
@@ -105,7 +99,6 @@
       <version>${zipkin.version}</version>
     </dependency>
     <dependency>
->>>>>>> 3a8fd611 (Ensure OTEL version from examples aligns with SDK and ITs (#1403))
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>