Merge branch 'master' of https://github.com/ArtifactForms/MeshLibCore

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