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

Fix some warnings #1967

Merged
merged 2 commits into from
Nov 22, 2019
Merged

Fix some warnings #1967

merged 2 commits into from
Nov 22, 2019

Conversation

Bond-009
Copy link
Member

@Bond-009 Bond-009 commented Nov 1, 2019

No description provided.

@JustAMan JustAMan added the merge conflict Merge conflicts should be resolved before a merge label Nov 22, 2019
@JustAMan
Copy link
Contributor

@Bond-009 you have a merge conflict now

@Bond-009 Bond-009 removed the merge conflict Merge conflicts should be resolved before a merge label Nov 22, 2019
@JustAMan JustAMan merged commit 7b3c394 into jellyfin:master Nov 22, 2019
@Bond-009 Bond-009 deleted the warn10 branch November 22, 2019 15:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants