fixes merge conflict

2018-08-07 22:25:01 +02:00 · 2018-08-07 22:25:01 +02:00 · d8e66d6acc
commit d8e66d6acc
parent e067a7681f c352329714
20 changed files with 225 additions and 53 deletions
--- a/changelog.md
+++ b/changelog.md
@ -95,6 +95,7 @@
 - Added the proc ``flush`` for memory mapped files.
 - Added the ``MemMapFileStream``.
 - Added ``macros.copyLineInfo`` to copy lineInfo from other node.
+- Added ``system.ashr`` an arithmetic right shift for integers.

 ### Library changes