forked from lix-project/lix
Fixup merge typo
This commit is contained in:
parent
8c3afd2d68
commit
2a7348f986
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue