From 908d8f71caed23b317f4c7a2b94ef2353bf185f1 Mon Sep 17 00:00:00 2001 From: KnugiHK <24708955+KnugiHK@users.noreply.github.com> Date: Mon, 19 Jan 2026 20:41:45 +0800 Subject: [PATCH] Fix merge conflict error --- Whatsapp_Chat_Exporter/android_handler.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Whatsapp_Chat_Exporter/android_handler.py b/Whatsapp_Chat_Exporter/android_handler.py index 49bf215..61c65e4 100644 --- a/Whatsapp_Chat_Exporter/android_handler.py +++ b/Whatsapp_Chat_Exporter/android_handler.py @@ -92,6 +92,7 @@ def messages(db, data, media_folder, timezone_offset, filter_date, filter_chat, _process_single_message(data, content, table_message, timezone_offset) pbar.update(1) total_time = pbar.format_dict['elapsed'] + _get_reactions(db, data) logger.info(f"Processed {total_row_number} messages in {convert_time_unit(total_time)}{CLEAR_LINE}") # Helper functions for message processing