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.MediaEncoding/Encoder/MediaEncoder.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')

diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 6d45022da..4fcc71f97 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -879,4 +879,4 @@ namespace MediaBrowser.MediaEncoding.Encoder
             }
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3