Fixup merge typo

2022-10-22 23:38:50 +02:00
parent 8c3afd2d68
commit 2a7348f986
1 changed files with 0 additions and 2 deletions
@@ -7,5 +7,3 @@
 * Error traces have been reworked to provide detailed explanations and more
  accurate error locations. A short excerpt of the trace is now shown by
  default when an error occurs.
-
->>>>>>> origin/master