diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-10-27 17:42:11 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-10-27 17:42:11 -0400 |
| commit | 2d9f7d678ca15b42c8e45431b10af40cd583c1b9 (patch) | |
| tree | 7c06a19dd6713fa28c3d4d79852886392c6ac244 | |
| parent | 885ea9f6ba33afdda7456bee9b1a2e8f07499709 (diff) | |
fix merge duplication
| -rw-r--r-- | MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs index 574251423..dbac826b3 100644 --- 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" |