From 4492dcc5922f4ead968504617b729e102db26c54 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 20 Sep 2015 13:34:05 -0400
Subject: update merge

---
 MediaBrowser.Model/Net/MimeTypes.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MediaBrowser.Model/Net')

diff --git a/MediaBrowser.Model/Net/MimeTypes.cs b/MediaBrowser.Model/Net/MimeTypes.cs
index 419809160b..e905af58da 100644
--- a/MediaBrowser.Model/Net/MimeTypes.cs
+++ b/MediaBrowser.Model/Net/MimeTypes.cs
@@ -321,4 +321,4 @@ namespace MediaBrowser.Model.Net
             return null;
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3