merged conflicts per jni change

2019-02-08 15:57:28 +08:00
parent 345e8ee263 ca1cfe51a9
commit 33b3c3d3af
2 changed files with 22 additions and 1 deletions
--- a/src/ir_decoder/src/ir_tv_control.c
+++ b/src/ir_decoder/src/ir_tv_control.c
@@ -315,7 +315,7 @@ static void print_ir_time(t_ir_data *data, UINT8 key_index, UINT16 *ir_time)
        }
        else if (ir_decode_flag == IRDA_DECODE_2_BITS)
        {
-            // for quanternary formatted code
+            // for quaternary formatted code
            process_decode_number(key_code, data, 2, ir_time);
        }
        else if (ir_decode_flag == IRDA_DECODE_4_BITS)