Merge libv1.

tests/language/bad_override_test.dart

Index: tests/language/bad_override_test.dart
diff --git a/tests/language/bad_override_test.dart b/tests/language/bad_override_test.dart
index 2bb690022d06f63a580bf1078f7c3f1ab939fa39..646df5c44538c93828bebacde1754a4941c82a6d 100644
--- a/tests/language/bad_override_test.dart
+++ b/tests/language/bad_override_test.dart
@@ -3,12 +3,14 @@
 // BSD-style license that can be found in the LICENSE file.
 
 class Fisk {
-  get fisk => null;
-  static /// 01: compile-time error
+  get fisk => null;	
+  static            /// 01: static type warning	
   set fisk(x) {}
-  static /// 02: compile-time error
-  get hest => null;
-  set hest(x) {}
+
+  static            /// 02: static type warning	
+  get hest => null;	
+  set hest(x) {}	
+
   foo() {}
   var field;
   method() {}
@@ -16,10 +18,10 @@ class Fisk {
 }
 
 class Hest extends Fisk {
-  static foo() {} /// 03: compile-time error
-  field() {} /// 04: compile-time error
-  var method; /// 05: compile-time error
-  nullary(x) {} /// 06: compile-time error
+  static foo() {}   /// 03: compile-time error
+  field() {}        /// 04: compile-time error
+  var method;       /// 05: compile-time error
+  nullary(x) {}     /// 06: compile-time error
 }
 
 main() {