typo

nicolaven · nicolaven · commit d01411db538f · 2024-07-12T08:45:53.000Z
diff --git a/apps/Abaqus/README.md b/apps/Abaqus/README.md
@@ -95,8 +95,4 @@ The most important parameters are:
 
 # Performance
 
-<<<<<<< HEAD
-Coming soon!
-=======
-Coming soon!
->>>>>>> 74452766afbaf243893a11b903750d5215f2b8ca
+Coming soon!
