Resolving merge conflicts.

mhopkins-msft · mhopkins-msft · commit 0b340edf28b0 · 2019-05-07T14:15:01.000-07:00
diff --git a/BlobStorage/App.config b/BlobStorage/App.config
@@ -33,8 +33,5 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<<<<<<< HEAD
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>
-=======
+  <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup>
 </configuration>
->>>>>>> d5d51592cb6f16e63c719ebcc68f3fc5a88e6b04
