Resolve various merge conflicts

2022-11-26 21:22:49 +01:00
parent e71a722fa6
commit 1bdf112529
5 changed files with 129 additions and 130 deletions
--- a/compiler/rustc_error_messages/src/lib.rs
+++ b/compiler/rustc_error_messages/src/lib.rs
@@ -57,8 +57,8 @@ fluent_messages! {
    lint => "../locales/en-US/lint.ftl",
    metadata => "../locales/en-US/metadata.ftl",
    middle => "../locales/en-US/middle.ftl",
-    mir_dataflow => "../locales/en-US/mir_dataflow.ftl",
    mir_build => "../locales/en-US/mir_build.ftl",
+    mir_dataflow => "../locales/en-US/mir_dataflow.ftl",
    monomorphize => "../locales/en-US/monomorphize.ftl",
    parse => "../locales/en-US/parse.ftl",
    passes => "../locales/en-US/passes.ftl",