Merge upstream

1 files changed, 2 insertions, 3 deletions

diff --git a/embassy-embedded-hal/src/shared_bus/blocking/i2c.rs b/embassy-embedded-hal/src/shared_bus/blocking/i2c.rs
index 12c2a1f4b..e8dd0f248 100644
--- a/embassy-embedded-hal/src/shared_bus/blocking/i2c.rs
+++ b/embassy-embedded-hal/src/shared_bus/blocking/i2c.rs
@@ -101,7 +101,6 @@ where
     }
 }
 
-<<<<<<< HEAD
 pub struct I2cBusDeviceWithConfig<'a, M: RawMutex, BUS, C> {
     bus: &'a Mutex<M, RefCell<BUS>>,
     config: C,
@@ -183,7 +182,8 @@ where
         let _ = operations;
         todo!()
     }
-=======
+}
+
 impl<'a, M, BUS, E> embedded_hal_02::blocking::i2c::Write for I2cBusDevice<'_, M, BUS>
 where
     M: RawMutex,
@@ -224,5 +224,4 @@ where
                 .map_err(I2cBusDeviceError::I2c)
         })
     }
->>>>>>> master
 }