From 2d9f7d678ca15b42c8e45431b10af40cd583c1b9 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 27 Oct 2013 17:42:11 -0400
Subject: fix merge duplication

---
 MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs')

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"
-- 
cgit v1.2.3