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/Configuration/ServerConfiguration.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'MediaBrowser.Model/Configuration')

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 551ca2305c..87b5e4fd71 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -103,7 +103,7 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         /// <value><c>true</c> if [disable startup scan]; otherwise, <c>false</c>.</value>
         public bool DisableStartupScan { get; set; }
-
+        
         /// <summary>
         /// Gets or sets a value indicating whether [enable library metadata sub folder].
         /// </summary>
@@ -223,7 +223,7 @@ namespace MediaBrowser.Model.Configuration
         public bool EnableWindowsShortcuts { get; set; }
 
         public bool EnableVideoFrameByFrameAnalysis { get; set; }
-
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
         /// </summary>
@@ -581,4 +581,4 @@ namespace MediaBrowser.Model.Configuration
             };
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3