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

Unified Diff: tests/lib_2/async/catch_errors.dart

Issue 3005813002: Relanding test block 170 migration. (Closed)
Patch Set: Created 3 years, 4 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 | tests/lib_2/lib_2_dart2js.status » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/lib_2/async/catch_errors.dart
diff --git a/tests/lib_2/async/catch_errors.dart b/tests/lib_2/async/catch_errors.dart
index 1f8d2233ad55931d175c59b6c17196161dfc9703..925ce2c2f269a3b1c3d3eb74acc86e0119078adc 100644
--- a/tests/lib_2/async/catch_errors.dart
+++ b/tests/lib_2/async/catch_errors.dart
@@ -2,11 +2,7 @@ library catch_errors;
import 'dart:async';
-<<<<<<< HEAD
-Stream catchErrors(dynamic body()) {
-=======
Stream catchErrors(void body()) {
->>>>>>> Migrated test block 170 to Dart 2.0.
StreamController controller;
bool onError(e, st) {
« no previous file with comments | « no previous file | tests/lib_2/lib_2_dart2js.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698