From 696cd8bd8728b8532ab718666871f6a4dcab3a1a Mon Sep 17 00:00:00 2001
From: "Jakob (XDjackieXD) Riepler" <jakob.riepler@chaosfield.at>
Date: Fri, 23 Aug 2019 20:02:53 +0200
Subject: [PATCH] fix merge f**k-up

---
 epicardium/epicardium.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/epicardium/epicardium.h b/epicardium/epicardium.h
index f701dc4f1..4eea7d3fe 100644
--- 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;
-- 
GitLab