diff options
author | Araq <rumpf_a@web.de> | 2011-01-06 00:45:50 +0100 |
---|---|---|
committer | Araq <rumpf_a@web.de> | 2011-01-06 00:45:50 +0100 |
commit | da325bc7a4590e7f7f388a0df941a10030bf445b (patch) | |
tree | fdd0242da1c2e59d7e09fd7b2105239a50e6db85 /lib/pure/math.nim | |
parent | eb727862e3e8bc96a3b51565b440abed532c3d1e (diff) | |
parent | f73d0e4657da999a71508971483740023d0b649d (diff) | |
download | Nim-da325bc7a4590e7f7f388a0df941a10030bf445b.tar.gz |
fixed whitespace conflict
Diffstat (limited to 'lib/pure/math.nim')
-rwxr-xr-x | lib/pure/math.nim | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pure/math.nim b/lib/pure/math.nim index c9f71b64b..89a0ccd25 100755 --- a/lib/pure/math.nim +++ b/lib/pure/math.nim @@ -210,7 +210,7 @@ else: proc cosh*(x: float): float = return (exp(x)+exp(-x))*0.5 proc hypot*(x, y: float): float = return sqrt(x*x + y*y) proc sinh*(x: float): float = return (exp(x)-exp(-x))*0.5 - proc sin*(x: float): float {.importc: "Math.sin", nodecl.} + proc sin*(x: float): float {.importc: "Math.sin", nodecl.} proc tan*(x: float): float {.importc: "Math.tan", nodecl.} proc tanh*(x: float): float = var y = exp(2.0*x) |