From 50a317556a077c6420677bf28de5ed1d90bc290a Mon Sep 17 00:00:00 2001
From: Deanna Garcia <deannagarcia@google.com>
Date: Wed, 2 Jun 2021 22:31:51 +0000
Subject: [PATCH] Fixing merge conflict

---
 java/kotlin/pom.xml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml
index f8d0cbfc54..e6a50a5532 100644
--- a/java/kotlin/pom.xml
+++ b/java/kotlin/pom.xml
@@ -219,22 +219,6 @@
           </execution>
         </executions>
       </plugin>
-<<<<<<< HEAD
-      <!-- OSGI bundle configuration -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Automatic-Module-Name>com.google.protobuf</Automatic-Module-Name> <!-- Java9+ Jigsaw module name -->
-            <Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
-            <Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName>
-            <Export-Package>com.google.protobuf;version=${project.version}</Export-Package>
-            <Import-Package>sun.misc;resolution:=optional,*</Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.jetbrains.dokka</groupId>
         <artifactId>dokka-maven-plugin</artifactId>