merge

boehmrn · Oct 20, 2023 · c650e16 · c650e16
1 parent b6bdcb4
commit c650e16
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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[] = {