Update utils.py

NyaaPy/utils.py

@@ -76,34 +76,6 @@ class Utils:
         torrents = []
 
         for row in table_rows[:limit]:
-<<<<<<< HEAD
-            block = []
-
-            for td in row.find_all('td'):
-                for link in td.find_all('a'):
-                    if link.get('href')[-9:] != '#comments':
-                        block.append(link.get('href'))
-                        block.append(link.text.rstrip())
-
-                if td.text.rstrip():
-                    block.append(td.text.rstrip())
-
-            torrent = {
-                'id': block[1].replace("/view/", ""),
-                'category': Utils.nyaa_categories(block[0]),
-                'url': "http://nyaa.si{}".format(block[1]),
-                'name': block[2],
-                'download_url': "http://nyaa.si{}".format(block[4]),
-                'magnet': block[5],
-                'size': block[6],
-                'date': block[7],
-                'seeders': block[8],
-                'leechers': block[9],
-                'completed_downloads': block[10],
-            }
-        
-            torrents.append(torrent)
-=======
             block = []
 
             for td in row.find_all('td'):
@@ -135,7 +107,6 @@ class Utils:
                 torrents.append(torrent)
             except IndexError as ie:
                 pass
->>>>>>> 8df5b27bd43ffbfacbc58124f2082370e9287a92
         
         return torrents