From dbc99be9a0b0b05b23f0f6e5623faae3876829e7 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Thu, 26 Mar 2026 07:04:23 +0000 Subject: cleanup Signed-off-by: Leah Rowe --- util/spkmodem_decode/spkmodem-decode.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'util/spkmodem_decode/spkmodem-decode.c') diff --git a/util/spkmodem_decode/spkmodem-decode.c b/util/spkmodem_decode/spkmodem-decode.c index 4af92b95..3b3b33f8 100644 --- a/util/spkmodem_decode/spkmodem-decode.c +++ b/util/spkmodem_decode/spkmodem-decode.c @@ -144,11 +144,7 @@ * Convert tone frequency ranges into pulse counts within the * sliding analysis window. * -<<<<<<< HEAD - * pulse_count is: tone_frequency / FRAME_RATE -======= * pulse_count = tone_frequency / FRAME_RATE ->>>>>>> a010665c1d (fix typo in comment) * where FRAME_RATE = SAMPLE_RATE / SAMPLES_PER_FRAME. */ #define FREQ_SEP_MIN ((SEP_TONE_MIN_HZ) / (FRAME_RATE)) -- cgit v1.2.1