Update pom.xml

ArtifactForms · web-flow · commit 00d43fd7c1fd · 2024-12-02T15:14:32.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -77,8 +77,4 @@
             <version>0.8.10</version>
         </dependency>
     </dependencies>
-<<<<<<< HEAD
 </project>
-=======
-</project>
->>>>>>> branch 'master' of https://github.com/ArtifactForms/MeshLibCore
