Merge up

Chia-Network · Aug 15, 2023 · 4055053 · 4055053
2 parents a4a6be7 + ceb24c8
commit 4055053
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/compiler/rename.rs b/src/compiler/rename.rs
@@ -208,9 +208,16 @@ fn rename_in_bodyform(namemap: &HashMap<Vec<u8>, Vec<u8>>, b: Rc<BodyForm>) -> B
             BodyForm::Let(
                 kind.clone(),
                 Box::new(LetData {
+<<<<<<< HEAD
                     bindings: new_bindings,
                     body: Rc::new(new_body),
                     ..*letdata.clone()
+=======
+                    loc: letdata.loc.clone(),
+                    kw: letdata.kw.clone(),
+                    bindings: new_bindings,
+                    body: Rc::new(new_body),
+>>>>>>> chia/base
                 }),
             )
         }