Skip to content

Commit abd5718

Browse files
committed
Merge branch 'develop'
2 parents 6ead57c + a8fa1dc commit abd5718

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/comm_interface.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ class SerialConnectionAVR;
4242
* @brief Enum class for possible bases
4343
*/
4444
enum class PrintBase : uint8_t {
45-
NONE = 0,
46-
BIN = 2,
47-
OCT = 8,
48-
DEC = 10,
49-
HEX = 16,
45+
NONE = 0,
46+
BIN = 2,
47+
OCT = 8,
48+
DEC = 10,
49+
HEX = 16,
5050
};
5151

5252
/**

src/scheduler.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
#include "ctbot_config.h"
2929

30-
#include <functor.h>
3130
#include <cstdint>
3231
#include <queue>
3332
#include <vector>

0 commit comments

Comments
 (0)