From a2c45807a46e726c2d6882acf82b4f90b4f66827 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Sat, 2 Nov 2013 15:10:08 +0900
Subject: [PATCH] merge fix

---
 src/usb_desc.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/usb_desc.c b/src/usb_desc.c
index f344c1f..46cd7f6 100644
--- a/src/usb_desc.c
+++ b/src/usb_desc.c
@@ -51,7 +51,6 @@ static const uint8_t hid_report_desc[] = {
   0xc0		    /* END_COLLECTION */
 };
 
->>>>>>> hid
 #define USB_ICC_INTERFACE_CLASS 0x0B
 #define USB_ICC_INTERFACE_SUBCLASS 0x00
 #define USB_ICC_INTERFACE_BULK_PROTOCOL 0x00