And some more merge mistakes

Author: gefjon

crates/schema/src/def/validate/v10.rs

@@ -290,7 +290,7 @@ pub fn validate(def: RawModuleDefV10) -> Result<ModuleDef> {
         .map(|rls| (rls.sql.clone(), rls.to_owned()))
         .collect();
 
-    let (tables, types, reducers, procedures, views, http_handlers, http_routes, mounts) =
+    let (tables, types, reducers, procedures, views, http_handlers, http_routes) =
         tables_types_reducers_procedures_views
             .map(
                 |(tables, types, reducers, procedures, views, (http_handlers, http_routes))| {
@@ -1004,9 +1004,7 @@ mod tests {
 
     use itertools::Itertools;
     use spacetimedb_data_structures::expect_error_matching;
-    use spacetimedb_lib::db::raw_def::v10::{
-        CaseConversionPolicy, MethodOrAny, RawModuleDefV10, RawModuleDefV10Builder, RawModuleDefV10Section,
-    };
+    use spacetimedb_lib::db::raw_def::v10::{CaseConversionPolicy, MethodOrAny, RawModuleDefV10Builder};
     use spacetimedb_lib::db::raw_def::v9::{btree, direct, hash};
     use spacetimedb_lib::db::raw_def::*;
     use spacetimedb_lib::http::Method as HttpMethod;