Fix merge conflict

launchdarkly · May 25, 2017 · d323330 · d323330
1 parent d856a9f
commit d323330
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/LaunchDarkly.Client/Configuration.cs b/src/LaunchDarkly.Client/Configuration.cs
@@ -164,13 +164,15 @@ public static Configuration WithHttpClientTimeout(this Configuration configurati
             configuration.HttpClientTimeout = timeSpan;
             return configuration;
         }
-        
+
         public static Configuration WithFeatureStore(this Configuration configuration, IFeatureStore featureStore)
         {
             if (featureStore != null)
             {
                 configuration.FeatureStore = featureStore;
             }
+            return configuration;
+        }
 
         public static Configuration WithHttpClientHandler(this Configuration configuration, HttpClientHandler httpClientHandler)
         {