Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(173)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tests/lib/lib.status

Issue 23708047: Remove merge error. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/lib/lib.status
===================================================================
--- tests/lib/lib.status (revision 27561)
+++ tests/lib/lib.status (working copy)
@@ -41,11 +41,8 @@
async/stream_controller_async_test: Fail, Pass # http://dartbug.com/11953
mirrors/typedef_test/none: Fail # http://dartbug.com/6490
mirrors/typedef_test/02: Fail, OK # Incorrect VM behavior.
-<<<<<<< .mine
mirrors/redirecting_factory_test/none: Fail # Issue 6490
-=======
mirrors/closures_test/none: Fail # Issue 6490
->>>>>>> .r27560
[ $runtime == safari ]
mirrors/return_type_test: Pass, Timeout # Issue 12858
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698