chore: Fix changes note for intelliJ plugin

vespa-engine · Oct 25, 2024 · abf6e4e · abf6e4e
1 parent e70237a
commit abf6e4e
Showing 1 changed file with 0 additions and 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
@@ -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>