From 60b7029fccd2e1146b453444ffec07da2d0805ee Mon Sep 17 00:00:00 2001 From: sharkykh Date: Sun, 14 May 2017 16:47:04 +0300 Subject: [PATCH] Remove merge conflict indicators --- nyaa/forms.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nyaa/forms.py b/nyaa/forms.py index cfe177b..46810b2 100644 --- a/nyaa/forms.py +++ b/nyaa/forms.py @@ -268,12 +268,8 @@ class TorrentFileData(object): # https://wiki.theory.org/BitTorrentSpecification#Metainfo_File_Structure -<<<<<<< master -def _validate_trackers(torrent_dict, tracker_to_check_for=None): -======= -def _validate_trackers(torrent_dict): ->>>>>>> PEP8 (a run of lint.sh) +def _validate_trackers(torrent_dict, tracker_to_check_for=None): announce = torrent_dict.get('announce') announce_string = _validate_bytes(announce, 'announce', 'utf-8')