fix merge conflict

This commit is contained in:
Araq 2018-12-12 17:51:33 +01:00
commit ac8274c60f
3 changed files with 51 additions and 6 deletions

View file

@ -86,10 +86,10 @@ proc enumToString*(enums: openArray[enum]): string =
- Added `macros.isInstantiationOf` for checking if the proc symbol
is instantiation of generic proc symbol.
- There is a new stdlib mdoule `experimental/diff` to compute the famous "diff"
- Added the parameter ``isSorted`` for the ``sequtils.deduplicate`` proc.
- There is a new stdlib module `std/diff` to compute the famous "diff"
of two texts by line.
### Library changes
- The string output of `macros.lispRepr` proc has been tweaked