Revert "Migrating a block of dart 2:"

tests/language_2/language_2_dart2js.status

Index: tests/language_2/language_2_dart2js.status
diff --git a/tests/language_2/language_2_dart2js.status b/tests/language_2/language_2_dart2js.status
index 441f2c0129bc1783ae316b55ab13277c5acc62b3..ffe4d8afd9078a9d2555d032534f421e0d9ef408 100644
--- a/tests/language_2/language_2_dart2js.status
+++ b/tests/language_2/language_2_dart2js.status
@@ -427,55 +427,6 @@ function_type/function_type98_test: Crash
 function_type/function_type99_test: Crash
 function_type/function_type9_test: Crash
 regress_30339_test: Crash
-class_literal_test/01: Crash
-class_literal_test/02: Crash
-class_literal_test/03: Crash
-class_literal_test/04: Crash
-class_literal_test/05: Crash
-class_literal_test/06: Crash
-class_literal_test/07: Crash
-class_literal_test/08: Crash
-class_literal_test/09: Crash
-class_literal_test/10: Crash
-class_literal_test/11: Crash
-class_literal_test/12: Crash
-class_literal_test/13: Crash
-class_literal_test/14: Crash
-class_literal_test/15: Crash
-class_literal_test/16: Crash
-class_literal_test/17: Crash
-class_literal_test/18: Crash
-class_literal_test/19: Crash
-class_literal_test/20: Crash
-class_literal_test/21: Crash
-class_literal_test/22: Crash
-class_literal_test/23: Crash
-class_literal_test/24: Crash
-class_literal_test/25: Crash
-class_literal_test/none: Crash
-class_override_test/00: Crash
-class_syntax2_test: Crash
-class_test: Crash
-classes_static_method_clash_test: Crash
-closure2_test: Crash
-closure3_test: Crash
-closure4_test: Crash
-closure5_test: Crash
-closure6_test: Crash
-closure7_test: Crash
-closure8_test: Crash
-closure_break1_test: Crash
-closure_break2_test: Crash
-closure_break_test: Crash
-closure_cycles_test: Crash
-closure_in_constructor_test: Crash
-closure_in_field_initializer_test: Crash
-closure_in_initializer2_test: Crash
-closure_in_initializer_test: Crash
-closure_internals_test: Crash
-closure_parameter_types_test: Crash
-closure_self_reference_test: Crash
-closure_shared_state_test: Crash
 
 [ $compiler == dart2js && $dart2js_with_kernel && $minified ]
 aborting_switch_case_test: Crash
@@ -763,58 +714,7 @@ function_type/function_type97_test: Crash
 function_type/function_type98_test: Crash
 function_type/function_type99_test: Crash
 function_type/function_type9_test: Crash
-<<<<<<< HEAD
 regress_30339_test: Crash
-=======
-class_literal_test/01: Crash
-class_literal_test/02: Crash
-class_literal_test/03: Crash
-class_literal_test/04: Crash
-class_literal_test/05: Crash
-class_literal_test/06: Crash
-class_literal_test/07: Crash
-class_literal_test/08: Crash
-class_literal_test/09: Crash
-class_literal_test/10: Crash
-class_literal_test/11: Crash
-class_literal_test/12: Crash
-class_literal_test/13: Crash
-class_literal_test/14: Crash
-class_literal_test/15: Crash
-class_literal_test/16: Crash
-class_literal_test/17: Crash
-class_literal_test/18: Crash
-class_literal_test/19: Crash
-class_literal_test/20: Crash
-class_literal_test/21: Crash
-class_literal_test/22: Crash
-class_literal_test/23: Crash
-class_literal_test/24: Crash
-class_literal_test/25: Crash
-class_override_test/00: Crash
-class_syntax2_test: Crash
-class_test: Crash
-classes_static_method_clash_test: Crash
-closure2_test: Crash
-closure3_test: Crash
-closure4_test: Crash
-closure5_test: Crash
-closure6_test: Crash
-closure7_test: Crash
-closure8_test: Crash
-closure_break1_test: Crash
-closure_break2_test: Crash
-closure_break_test: Crash
-closure_cycles_test: Crash
-closure_in_constructor_test: Crash
-closure_in_field_initializer_test: Crash
-closure_in_initializer2_test: Crash
-closure_in_initializer_test: Crash
-closure_internals_test: Crash
-closure_parameter_types_test: Crash
-closure_self_reference_test: Crash
-closure_shared_state_test: Crash
->>>>>>> Block of dart 2.0 tests
 
 [ $compiler == dart2js && ! $dart2js_with_kernel && $runtime != none ]
 async_star_cancel_while_paused_test: RuntimeError # Issue 22853