evanferrao
/
dump-mirrorbot
mirror of https://github.com/Box-boi/dump-mirrorbot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix git conflict

This commit is contained in:
jaskaranSM 2019-12-24 21:16:46 +05:30
parent 8a516024cb
commit e69625c406
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bot/modules/mirror.py
View File

@ -94,11 +94,7 @@ class MirrorListener(listeners.MirrorListeners):
share_url = f'{INDEX_URL}/{download_dict[self.uid].name()}' share_url = f'{INDEX_URL}/{download_dict[self.uid].name()}'
share_url = share_url.replace(' ', '%20') share_url = share_url.replace(' ', '%20')
if INDEX_URL is not None: if INDEX_URL is not None:
<<<<<<< HEAD
msg += f'\n\n Shareable link: <a href="{share_url}/">here</a>'
=======
msg += f'\n\n Shareable link: <a href="{share_url}">here</a>' msg += f'\n\n Shareable link: <a href="{share_url}">here</a>'
>>>>>>> b31a39f11ab17c9d64721e6db23821d54c76e496
if len(download_dict) == 0: if len(download_dict) == 0:
self.clean() self.clean()