fix merge duplication

11 years ago · 2d9f7d678c
parent 885ea9f6ba
commit 2d9f7d678c
1 changed files with 0 additions and 1 deletions
--- a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
+++ b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
@ -43,7 +43,6 @@ namespace MediaBrowser.Controller.Resolvers
                ".flv",
                ".f4v",
                ".3gp",
                ".rec",
                ".webm",
                ".mts",
                ".rec"