Opps remove merge marks

Chia-Network · Aug 16, 2023 · b07a31f · b07a31f
1 parent 4055053
commit b07a31f
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/src/compiler/rename.rs b/src/compiler/rename.rs
@@ -208,16 +208,9 @@ 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
                 }),
             )
         }