fix

Author: burrbull

src/generate/register.rs

@@ -51,27 +51,6 @@ pub fn render(
     }
 
     if can_write {
-<<<<<<< HEAD
-=======
-        reg_impl_items.push(quote! {
-            ///Writes to the register
-            #[inline(always)]
-            pub fn write<F>(&self, f: F)
-            where
-                F: FnOnce(&mut W) -> &mut W
-            {
-                self.register.set(f(&mut W { bits: Self::reset_value() }).bits);
-            }
-        });
-
-        mod_items.push(quote! {
-            ///Value to write to the register
-            pub struct W {
-                bits: #rty,
-            }
-        });
-
->>>>>>> 36c3ec31ee36af02a543bff21c40f2861e6cb1c5
         let rv = register
             .reset_value
             .or(defs.reset_value)