Fixed some syntax errors mentioned by @crash7 and also added Aiwa decoding to the changelog

2026-01-04 20:42:49 +00:00 · 2015-03-09 15:47:31 -06:00
parent 74622ec776
commit 0096727887
3 changed files with 1 additions and 2 deletions
--- a/IRremote.cpp
+++ b/IRremote.cpp
@@ -631,7 +631,6 @@ long IRrecv::decodeSony(decode_results *results) {
  return DECODED;
 }

-<<<<<<< HEAD
 long IRrecv::decodeWhynter(decode_results *results) {
  long data = 0;
  
--- a/IRremote.h
+++ b/IRremote.h
@@ -55,7 +55,6 @@ public:
 #define WHYNTER 13
 #define Sharp 14
 #define AIWA_RC_T501 15
->>>>>>> crash7-master
 #define UNKNOWN -1

 // Decoded value for NEC when a repeat code is received
--- a/changelog.md
+++ b/changelog.md
@@ -5,3 +5,4 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [1.0.1] - 2015-03-08
 ### Added
 - Support for Sharp Decoding
+- Support for Aiwa Decoding