From c650e16cd2c84ee74ca05cac2227c19524e7efb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robin=20B=C3=B6hm?= <robinboehm@hotmail.com>
Date: Fri, 20 Oct 2023 14:31:52 +0200
Subject: [PATCH] merge

---
 app/include/zmk/hid.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/include/zmk/hid.h b/app/include/zmk/hid.h
index 61d8bc3af671..8dc682d41b78 100644
--- a/app/include/zmk/hid.h
+++ b/app/include/zmk/hid.h
@@ -15,11 +15,8 @@
 #include <dt-bindings/zmk/hid_usage.h>
 #include <dt-bindings/zmk/hid_usage_pages.h>
 
-<<<<<<< HEAD
 #define ZMK_HID_KEYBOARD_NKRO_MAX_USAGE HID_USAGE_KEY_KEYPAD_EQUAL
    
-=======
->>>>>>> cdc-mkb/mouse-pim447
 #define COLLECTION_REPORT 0x03
 
 static const uint8_t zmk_hid_report_desc[] = {