diff options
| author | Carlo Zancanaro <carlo@carlo-laptop> | 2012-10-30 20:56:38 +1100 |
|---|---|---|
| committer | Carlo Zancanaro <carlo@carlo-laptop> | 2012-10-30 20:56:38 +1100 |
| commit | 6a4786bde976e9a023c7f65a395384d214c5102c (patch) | |
| tree | f3dd303f21dfa0be269a932dd05438041a290f27 /impl/test | |
| parent | ff2030f3a19926334fbe3a043c5f88622c17c2f8 (diff) | |
| parent | 95b82ea3830c3a34455323167894647e3aa773a6 (diff) | |
Merge branch 'master' of ssh://bitbucket.org/czan/honours
Conflicts:
impl/test/run
Diffstat (limited to 'impl/test')
| -rw-r--r-- | impl/test/7.eqns | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/impl/test/7.eqns b/impl/test/7.eqns index 1f69268..2789f0e 100644 --- a/impl/test/7.eqns +++ b/impl/test/7.eqns @@ -1,5 +1,5 @@ x = 0 -y = max(x,a) +y = max(-inf, x, a) a = b b = c c = d |