fixes merge conflict

This commit is contained in:
Araq
2018-08-23 11:30:55 +02:00
40 changed files with 1844 additions and 1695 deletions

View File

@@ -571,8 +571,8 @@ With parenthesis and semicolons ``(;)`` you can use statements where only
an expression is allowed:
.. code-block:: nim
# computes fac(4) at compile time:
:test: "nim c $1"
# computes fac(4) at compile time:
const fac4 = (var x = 1; for i in 1..4: x *= i; x)