Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull Sonarr commit 'New: Custom formats in episode history' #4408

Closed
servarr bot opened this issue Jan 3, 2024 · 0 comments
Closed

Pull Sonarr commit 'New: Custom formats in episode history' #4408

servarr bot opened this issue Jan 3, 2024 · 0 comments
Labels
conflict conflict - cannot merge, needs resolution sonarr-pull pull from sonarr commit

Comments

@servarr
Copy link
Contributor

servarr bot commented Jan 3, 2024

Pull Sonarr/Sonarr@cd2ce34

git cherry-pick -ex cd2ce34f10007efacd8631d3ce3ac4f4a6212966

This commit has 9 conflict(s)

You can ask me to close all, open pr here or open pr everywhere

@servarr servarr bot added conflict conflict - cannot merge, needs resolution sonarr-pull pull from sonarr commit labels Jan 3, 2024
zhangdoa pushed a commit to zhangdoa/Lidarr that referenced this issue Jan 7, 2024
(cherry picked from commit cd2ce34f10007efacd8631d3ce3ac4f4a6212966)

Closes Lidarr#4408
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 7, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
conflict conflict - cannot merge, needs resolution sonarr-pull pull from sonarr commit
Projects
None yet
Development

No branches or pull requests

0 participants