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

Unified Diff: tests/corelib_2/corelib_2.status

Issue 2983863002: Fixed merge issue (Closed)
Patch Set: Created 3 years, 5 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/corelib_2/corelib_2.status
diff --git a/tests/corelib_2/corelib_2.status b/tests/corelib_2/corelib_2.status
index 0c7ee6cc080855bcd5c785e6091a175aea61a72b..19399ef683f4110723691c101d0e046b7e5bff34 100644
--- a/tests/corelib_2/corelib_2.status
+++ b/tests/corelib_2/corelib_2.status
@@ -48,4 +48,3 @@ compare_to2_test: RuntimeError
[ $compiler == none && $runtime == drt ]
bool_from_environment2_test: Skip
bool_from_environment_test: Skip
->>>>>>> Migrate test block 1 to Dart 2.0.
« 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