diff --git a/README.md b/README.md index 94f5e0f..3ac98f2 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Types of Trakt lists supported: - Anticipated - - boxoffice + - Boxoffice - Public lists @@ -669,7 +669,11 @@ Options: --help Show this message and exit. ``` +<<<<<<< HEAD _Note: This command only works with `-id` or `--show_id` specified (i.e. not with lists), and support both Trakt IDs and IMDB IDs._ +======= +_Note: This command only works with `-id` or `--show_id` specified (i.e. not with lists), and supports both Trakt IDs and IMDB IDs._ +>>>>>>> Readme: minor fixes ### Movies (Multiple Movies) @@ -720,7 +724,11 @@ Options: --help Show this message and exit. ``` +<<<<<<< HEAD _Note: This command only works with `-id` or `--show_id` specified (i.e. not with lists), and support both Trakt IDs and IMDB IDs._ +======= +_Note: This command only works with `-id` or `--show_id` specified (i.e. not with lists), and supports both Trakt IDs and IMDB IDs._ +>>>>>>> Readme: minor fixes ### Shows (Multiple Shows)