jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed merge conflict

Browse source
This commit is contained in:
Andreas Rumpf 2018-06-04 16:16:50 +02:00
commit 12996c08a1
30 changed files with 879 additions and 332 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/manual.rst
View file

@ -3196,7 +3196,7 @@ notation. (Thus an operator can have more than two parameters):
# Multiply and add
result = a * b + c
assert `*+`(3, 4, 6) == `*`(a, `+`(b, c))
assert `*+`(3, 4, 6) == `+`(`*`(a, b), c)
Export marker