Skip to content

Commit

Permalink
Merge branch 'InfiniTimeOrg:main' into casio-weather
Browse files Browse the repository at this point in the history
  • Loading branch information
Ghoelian authored Nov 25, 2024
2 parents eb6c362 + 79ee886 commit 2d180c8
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion src/components/datetime/DateTimeController.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ namespace Pinetime {
*
* used to update difference between utc and local time (see UtcOffset())
*
* parameters are in quarters of an our. Following the BLE CTS specification,
* parameters are in quarters of an hour. Following the BLE CTS specification,
* timezone is expected to be constant over DST which will be reported in
* dst field.
*/
Expand Down
1 change: 0 additions & 1 deletion src/displayapp/screens/Timer.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#pragma once

#include "displayapp/screens/Screen.h"
#include "components/datetime/DateTimeController.h"
#include "systemtask/SystemTask.h"
#include "displayapp/LittleVgl.h"
#include "displayapp/widgets/Counter.h"
Expand Down

0 comments on commit 2d180c8

Please sign in to comment.