From 2055b8a3a29f780098b1a9629501b86a6455f3a6 Mon Sep 17 00:00:00 2001
From: dario <dario.vandenboom@arcor.de>
Date: Fri, 5 Jul 2024 10:42:46 +0200
Subject: [PATCH] Removed even more conflicts

---
 include/sta/drivers/bmi088.hpp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/include/sta/drivers/bmi088.hpp b/include/sta/drivers/bmi088.hpp
index caf363f..41b5484 100644
--- a/include/sta/drivers/bmi088.hpp
+++ b/include/sta/drivers/bmi088.hpp
@@ -1,18 +1,8 @@
 #ifndef STA_DRIVERS_BMI088_HPP
 #define STA_DRIVERS_BMI088_HPP
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-//#include <sta/devices/stm32/bus/spi.hpp>
-//#include <sta/devices/stm32/bus/i2c.hpp>
 #include <sta/bus/spi/device.hpp>
 #include <sta/bus/i2c/device.hpp>
-=======
-#include <sta/bus/spi/device.hpp>
->>>>>>> 2e8b075 (Added mock driver; renamed enums and fixed a bug)
-=======
-#include <sta/bus/spi/device.hpp>
->>>>>>> 86456b898b23d4c97f2314301d4924bb93e7a2d2
 
 #include <sta/drivers/bmi088_defs.hpp>