Fixed conflict

Author: will-tong

Microsoft.WindowsAzure.Storage/includes/was/core.h

@@ -408,11 +408,7 @@ namespace azure { namespace storage {
         }
 
         /// <summary>
-<<<<<<< HEAD
         /// Sets the account key for the credentials.
-=======
-        /// Sets the accounts for the credentials.
->>>>>>> 1fe4ab9dafa5add45f454d05fc11f8482367828e
         /// </summary>
         /// <param name="account_key">A string containing the Base64-encoded account access key.</param>
         void set_account_key(const utility::string_t& account_key)
@@ -421,11 +417,7 @@ namespace azure { namespace storage {
         }
 
         /// <summary>
-<<<<<<< HEAD
         /// Sets the account key for the credentials.
-=======
-        /// Sets the accounts for the credentials.
->>>>>>> 1fe4ab9dafa5add45f454d05fc11f8482367828e
         /// </summary>
         /// <param name="account_key">An array of bytes that represent the account access key.</param>
         void set_account_key(std::vector<uint8_t> account_key)