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/components/heartrate/Ppg.h | |
parent | 94561b233136334c7507925b04a345adb0e6c769 (diff) | |
parent | e0013e730448f4dc142e3610f970f22c807ac41e (diff) |
resolves conflicts
Diffstat (limited to 'src/components/heartrate/Ppg.h')
-rw-r--r-- | src/components/heartrate/Ppg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/heartrate/Ppg.h b/src/components/heartrate/Ppg.h index 00014162..ed79b082 100644 --- a/src/components/heartrate/Ppg.h +++ b/src/components/heartrate/Ppg.h @@ -1,8 +1,8 @@ #pragma once #include <array> -#include "Biquad.h" -#include "Ptagc.h" +#include "components/heartrate/Biquad.h" +#include "components/heartrate/Ptagc.h" namespace Pinetime { namespace Controllers { |