summaryrefslogtreecommitdiff
path: root/Test/dafny0/Trait/TraitUsingParentMembers.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/Trait/TraitUsingParentMembers.dfy.expect
parente17ec43d4f53d179c367b5c6bb52c893e0f57bff (diff)
Resolved further merge issues
Diffstat (limited to 'Test/dafny0/Trait/TraitUsingParentMembers.dfy.expect')
-rw-r--r--Test/dafny0/Trait/TraitUsingParentMembers.dfy.expect2
1 files changed, 1 insertions, 1 deletions
diff --git a/Test/dafny0/Trait/TraitUsingParentMembers.dfy.expect b/Test/dafny0/Trait/TraitUsingParentMembers.dfy.expect
index 6849499c..b59d7b80 100644
--- a/Test/dafny0/Trait/TraitUsingParentMembers.dfy.expect
+++ b/Test/dafny0/Trait/TraitUsingParentMembers.dfy.expect
@@ -5,4 +5,4 @@ Execution trace:
(0,0): anon2
(0,0): anon6_Then
-Dafny program verifier finished with 9 verified, 1 error
+Dafny program verifier finished with 7 verified, 1 error