Update nyaa.py

2020-02-01 17:06:51 +01:00
parent 4f604ce0f2
commit cc565bf945
1 changed files with 0 additions and 3 deletions
--- a/NyaaPy/nyaa.py
+++ b/NyaaPy/nyaa.py
@@ -5,11 +5,8 @@ from NyaaPy import utils
 class Nyaa:

    def __init__(self):
-<<<<<<< HEAD
        self.SITE = utils.TorrentSite.NYAASI
-=======
        self.URI = "https://nyaa.si"
->>>>>>> 5c93e516ba364d448335ebdc6989f8e1724c88c7

    def last_uploads(self, number_of_results):
        r = requests.get(self.SITE.value)