Commit 696cd8bd authored by Jakob's avatar Jakob

fix merge f**k-up

parent 92d32234
......@@ -131,8 +131,6 @@ typedef _Bool bool;
#define API_MAX86150_GET_DATA 0x0101
#define API_MAX86150_SET_LED_AMPLITUDE 0x0102
>>>>>>> 4f32a5ceaf749a0f8bc8b2b6ec706e118dd368fd
/* clang-format on */
typedef uint32_t api_int_id_t;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment