a3x/nyaa
1
0
Fork 0
mirror of https://gitlab.com/SIGBUS/nyaa.git synced 2024-12-22 13:49:59 +00:00
Code Issues Projects Releases Wiki Activity

Remove merge conflict indicators

Browse source
This commit is contained in:
sharkykh 2017-05-14 16:47:04 +03:00 committed by Kfir Hadas
parent 571b7f2930
commit 60b7029fcc
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nyaa/forms.py
View file

@ -268,12 +268,8 @@ class TorrentFileData(object):
# https://wiki.theory.org/BitTorrentSpecification#Metainfo_File_Structure # https://wiki.theory.org/BitTorrentSpecification#Metainfo_File_Structure
<<<<<<< master
def _validate_trackers(torrent_dict, tracker_to_check_for=None):
=======
def _validate_trackers(torrent_dict): def _validate_trackers(torrent_dict, tracker_to_check_for=None):
>>>>>>> PEP8 (a run of lint.sh)
announce = torrent_dict.get('announce') announce = torrent_dict.get('announce')
announce_string = _validate_bytes(announce, 'announce', 'utf-8') announce_string = _validate_bytes(announce, 'announce', 'utf-8')