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

This commit is contained in:
Rafi Khan
2015-03-09 15:47:31 -06:00
parent 74622ec776
commit 0096727887
3 changed files with 1 additions and 2 deletions

View File

@@ -631,7 +631,6 @@ long IRrecv::decodeSony(decode_results *results) {
return DECODED;
}
<<<<<<< HEAD
long IRrecv::decodeWhynter(decode_results *results) {
long data = 0;