More test fixes and rebase conflicts

2015-01-21 11:56:52 -08:00 · 2015-01-21 11:56:52 -08:00 · ecbee2e568
commit ecbee2e568
parent df1cddf20a
4 changed files with 3 additions and 3 deletions
--- a/src/librustc/diagnostics.rs
+++ b/src/librustc/diagnostics.rs
@ -78,7 +78,6 @@ register_diagnostics! {
    E0139,
    E0152,
    E0153,
-    E0154,
    E0157,
    E0158,
    E0161,