q792602257/XiguaLiveDanmakuHelper
Archived
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Conflicts

Browse Source 
# Conflicts:
#	api.py
This commit is contained in:
Jerry Yan
2019-01-28 18:58:16 +08:00
parent 5da70e81f9 f7727a3c39
commit cd4d7605f5
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api.py
View File

@ -155,7 +155,10 @@ if __name__ == "__main__":
room = 97621754276 # 永恒 room = 97621754276 # 永恒
# room = 75366565294 # room = 75366565294
# room = 83940182312 #Dae # room = 83940182312 #Dae
<<<<<<< HEAD
# room = 58649240617 #ll # room = 58649240617 #ll
=======
>>>>>>> f7727a3c3962342c753890954a25cbe05c113cf9
if len(sys.argv) > 1: if len(sys.argv) > 1:
if sys.argv[-1] == "d": if sys.argv[-1] == "d":
DEBUG = True DEBUG = True