diff options
author | SteveAmor <SteveAmor@users.noreply.github.com> | 2022-01-02 22:27:43 +0000 |
---|---|---|
committer | SteveAmor <SteveAmor@users.noreply.github.com> | 2022-01-02 22:27:43 +0000 |
commit | cc259b6a4ac93d507fa372a41ea653dedeb791ea (patch) | |
tree | 3c8b8b937b2b91149003195679ce5acda1154c4d /src/drivers/Bma421.cpp | |
parent | 94561b233136334c7507925b04a345adb0e6c769 (diff) | |
parent | e0013e730448f4dc142e3610f970f22c807ac41e (diff) |
resolves conflicts
Diffstat (limited to 'src/drivers/Bma421.cpp')
-rw-r--r-- | src/drivers/Bma421.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/Bma421.cpp b/src/drivers/Bma421.cpp index dd284000..2f60f42f 100644 --- a/src/drivers/Bma421.cpp +++ b/src/drivers/Bma421.cpp @@ -1,7 +1,7 @@ +#include "drivers/Bma421.h" #include <libraries/delay/nrf_delay.h> #include <libraries/log/nrf_log.h> -#include "Bma421.h" -#include "TwiMaster.h" +#include "drivers/TwiMaster.h" #include <drivers/Bma421_C/bma423.h> using namespace Pinetime::Drivers; |