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/alarm | |
| parent | 94561b233136334c7507925b04a345adb0e6c769 (diff) | |
| parent | e0013e730448f4dc142e3610f970f22c807ac41e (diff) | |
resolves conflicts
Diffstat (limited to 'src/components/alarm')
| -rw-r--r-- | src/components/alarm/AlarmController.cpp | 2 | ||||
| -rw-r--r-- | src/components/alarm/AlarmController.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/components/alarm/AlarmController.cpp b/src/components/alarm/AlarmController.cpp index 67ca05a9..28b328d5 100644 --- a/src/components/alarm/AlarmController.cpp +++ b/src/components/alarm/AlarmController.cpp @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include "AlarmController.h" +#include "components/alarm/AlarmController.h" #include "systemtask/SystemTask.h" #include "app_timer.h" #include "task.h" diff --git a/src/components/alarm/AlarmController.h b/src/components/alarm/AlarmController.h index bf85d431..f39fbded 100644 --- a/src/components/alarm/AlarmController.h +++ b/src/components/alarm/AlarmController.h @@ -18,7 +18,6 @@ #pragma once #include <cstdint> -#include "app_timer.h" #include "components/datetime/DateTimeController.h" namespace Pinetime { |