| 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) {
|
|
|