fix merge f**k-up

696cd8bd · Jakob · 92d32234 · 696cd8bd
Commit 696cd8bd authored Aug 23, 2019 by Jakob
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

epicardium/epicardium.h epicardium/epicardium.h +0 -2

No files found.
--- a/epicardium/epicardium.h
+++ b/epicardium/epicardium.h
@@ -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;