yshtcn/DiaryAssistant_bot
1
0
Fork 0
mirror of https://github.com/yshtcn/DiaryAssistant_bot.git synced 2025-12-15 18:50:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/yshtcn/DiaryAssistant_bot

Browse Source 
# Conflicts:
#	Diary Assistant.py
This commit is contained in:
yshtcn 2023-09-25 21:16:14 +08:00
commit c120e59393
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Diary Assistant.py
View File

@ -151,7 +151,13 @@ def process_message_queue():
# 主程序逻辑 # 主程序逻辑
def main(): def main():
<<<<<<< HEAD
print("Program started") print("Program started")
=======
print("Process message queue...")
process_message_queue()
print("Program started") # Debugging line
>>>>>>> d8cb43934c49a7dba8d22b55f28bf90eef5c45d7
last_update_id = None last_update_id = None
while True: while True:
print("Process message queue...") print("Process message queue...")