Changeset 85d44c6 for tests/.expect/completeTypeError.txt

Timestamp:

Feb 14, 2019, 10:23:51 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

fba51ab

Parents:

6d01d89 (diff), e15853c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

fix conflict

File:

• tests/.expect/completeTypeError.txt (modified) (1 diff)

tests/.expect/completeTypeError.txt

@@ -45 +45 @@
 
 Alternatives with failing assertions are:
-Cost ( 0, 1, 0, 1, -5, 0 ): Application of
+Cost ( 0, 1, 0, 0, 1, -5, 0 ): Application of
      Variable Expression: baz: forall
        T: sized object type