resolve merge conflict

This commit is contained in:
bobokun 2022-12-19 19:15:20 -05:00
parent fd18d54783
commit c73479cc7c
No known key found for this signature in database
GPG key ID: B73932169607D927

View file

@ -518,7 +518,7 @@ class Qbt:
continue
for torrent in torrent_list:
tracker = self.config.get_tags(torrent.trackers)
has_nohardlinks = util.nohardlink(torrent["content_path"].replace(root_dir, remote_dir))
has_nohardlinks = util.nohardlink(torrent["content_path"].replace(root_dir, remote_dir), self.config.notify)
if any(tag in torrent.tags for tag in nohardlinks[category]["exclude_tags"]):
# Skip to the next torrent if we find any torrents that are in the exclude tag
continue