summaryrefslogtreecommitdiff
path: root/Test/dafny0/ResolutionErrors.dfy.expect
diff options
context:
space:
mode:
authorGravatar leino <unknown>2014-08-05 10:06:39 -0700
committerGravatar leino <unknown>2014-08-05 10:06:39 -0700
commit498bff41addc9ca481926f668fb6b69b17b9deda (patch)
tree7294a111a6b5ef3a11f0a864cebe5cfbb919630f /Test/dafny0/ResolutionErrors.dfy.expect
parente17ec43d4f53d179c367b5c6bb52c893e0f57bff (diff)
Resolved further merge issues
Diffstat (limited to 'Test/dafny0/ResolutionErrors.dfy.expect')
-rw-r--r--Test/dafny0/ResolutionErrors.dfy.expect3
1 files changed, 2 insertions, 1 deletions
diff --git a/Test/dafny0/ResolutionErrors.dfy.expect b/Test/dafny0/ResolutionErrors.dfy.expect
index d5d12eb9..b11fa9f8 100644
--- a/Test/dafny0/ResolutionErrors.dfy.expect
+++ b/Test/dafny0/ResolutionErrors.dfy.expect
@@ -172,4 +172,5 @@ ResolutionErrors.dfy(956,10): Error: second argument to % must be of type int (i
ResolutionErrors.dfy(960,7): Error: type conversion to real is allowed only from int (got real)
ResolutionErrors.dfy(961,7): Error: type conversion to int is allowed only from real (got int)
ResolutionErrors.dfy(962,7): Error: type conversion to int is allowed only from real (got nat)
-174 resolution/type errors detected in ResolutionErrors.dfy
+ResolutionErrors.dfy(1101,8): Error: new cannot be applied to a trait
+175 resolution/type errors detected in ResolutionErrors.dfy