From abf6e4ebe99b2d0a6d9df2db68b8a7c537488312 Mon Sep 17 00:00:00 2001
From: Theodor Kvalsvik Lauritzen <theodor.k.lauritzen@gmail.com>
Date: Fri, 25 Oct 2024 15:52:44 +0200
Subject: [PATCH] chore: Fix changes note for intelliJ plugin

---
 .../clients/intellij/src/main/resources/META-INF/plugin.xml    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/integration/schema-language-server/clients/intellij/src/main/resources/META-INF/plugin.xml b/integration/schema-language-server/clients/intellij/src/main/resources/META-INF/plugin.xml
index ad6afd97ab14..92b5b8c7d9dd 100644
--- a/integration/schema-language-server/clients/intellij/src/main/resources/META-INF/plugin.xml
+++ b/integration/schema-language-server/clients/intellij/src/main/resources/META-INF/plugin.xml
@@ -25,10 +25,7 @@
   <change-notes><![CDATA[
 <h2>Refactored to use LSP4IJ</h2>
 The plugin will now support better syntax highlighting with semantic tokens and renaming.
-<<<<<<< HEAD
-=======
 In addition, the plugin will be available for community editions as well.
->>>>>>> 25ae8f2cc2f (chore: Update the IntelliJ plugin change notes)
 ]]></change-notes>
   <depends>com.intellij.modules.platform</depends>
   <depends>com.redhat.devtools.lsp4ij</depends>