From 99c5617424a683d0ea738a74fa1be6ca7083e7f8 Mon Sep 17 00:00:00 2001
From: yshtcn <k.yshtcn+github@gmail.com>
Date: Mon, 25 Sep 2023 21:17:46 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E6=9B=B4=E6=AD=A3git=E5=A4=B1=E8=AF=AF?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Diary Assistant.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Diary Assistant.py b/Diary Assistant.py
index 9288dbc..ab1473f 100644
--- a/Diary Assistant.py	
+++ b/Diary Assistant.py	
@@ -151,13 +151,7 @@ def process_message_queue():
 
 # 主程序逻辑
 def main():
-<<<<<<< HEAD
-    print("Program started")  
-=======
-    print("Process message queue...")
-    process_message_queue()
     print("Program started")  # Debugging line
->>>>>>> d8cb43934c49a7dba8d22b55f28bf90eef5c45d7
     last_update_id = None
     while True:
         print("Process message queue...")