Index: tools/idl_parser/test_parser/interface_web.idl |
diff --git a/tools/idl_parser/test_parser/interface_web.idl b/tools/idl_parser/test_parser/interface_web.idl |
index 007ac7ffed8dc8447b476ca2f422c014b8241554..e69a2407e66968c06d7f324913a76fd3a76f8548 100644 |
--- a/tools/idl_parser/test_parser/interface_web.idl |
+++ b/tools/idl_parser/test_parser/interface_web.idl |
@@ -71,14 +71,7 @@ interface MyIFaceMissingAttribute { |
readonly double foo; |
}; |
-/* TREE |
- *Interface(MyIFaceContainsUnresolvedConflictDiff) |
- * Operation(foo) |
- * Arguments() |
- * Type() |
- * PrimitiveType(DOMString) |
- * Error(Unexpected "<" after ";".) |
- */ |
+/* ERROR Unexpected "<" after ";". */ |
interface MyIFaceContainsUnresolvedConflictDiff { |
DOMString foo(); |
<<<<<< ours |