From 93c6e4af5543b0657b3f8dd5c7e7ad6c7c4ffc50 Mon Sep 17 00:00:00 2001 From: Rafi Khan Date: Sun, 8 Mar 2015 00:05:16 -0600 Subject: [PATCH] changed SHARP to 14 --- IRremote.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/IRremote.h b/IRremote.h index 9c5d872..c0ad483 100644 --- a/IRremote.h +++ b/IRremote.h @@ -52,11 +52,8 @@ public: #define MITSUBISHI 10 #define SAMSUNG 11 #define LG 12 -<<<<<<< HEAD #define WHYNTER 13 -======= -#define SHARP 13 ->>>>>>> 0b9d907da992bbb56493164e79d37006ec52e777 +#define SHARP 14 #define UNKNOWN -1 // Decoded value for NEC when a repeat code is received