Skip to content

Commit

Permalink
fix ratings.py merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
zeroquinc committed May 25, 2024
1 parent 02cd05b commit 14f4772
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
1 change: 1 addition & 0 deletions api/radarr/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from utils.custom_logger import logger

from src.radarr.functions import process_webhook

class RadarrWebhookHandler:
def __init__(self, payload, discord_bot):
self.payload = payload
Expand Down
5 changes: 1 addition & 4 deletions api/trakt/models/rating.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
from dateutil.parser import parse
from dateutil.tz import tzlocal

from api.trakt.models.movie import Movie
from api.trakt.models.show import Show
from api.trakt.models.season import Season
from api.trakt.models.episode import Episode
from api.tmdb.client import TMDb

class Rating:
def __init__(self, data):
Expand Down

0 comments on commit 14f4772

Please sign in to comment.