Fixed merge conflicts.

Author: mhopkins-msft

BlobStorage/App.config

@@ -6,8 +6,8 @@
          you can create a storage account and run against Azure Storage. Comment out the connection string below and use the 
          second connection string. Insert your storage account name and key in the placeholders in the line below.          
          We recommend creating a new storage account for testing purposes, rather than using a production account for running the samples.-->
-    <add key="StorageConnectionString" value="UseDevelopmentStorage=true;"/>
-    <!--<add key="StorageConnectionString" value="DefaultEndpointsProtocol=https;AccountName=[Account Name];AccountKey=[Account Key]" />-->
+    <add key="StorageConnectionString" value="UseDevelopmentStorage=true;" />
+    <!--<add key="StorageConnectionString" value="DefaultEndpointsProtocol=https;AccountName=[AccountName];AccountKey=[AccountKey]" />-->
   </appSettings>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -33,4 +33,8 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
+<<<<<<< HEAD
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>
+=======
+</configuration>
+>>>>>>> d5d51592cb6f16e63c719ebcc68f3fc5a88e6b04