updated conflicts

Author: kai-ion

src/aws-cpp-sdk-core/include/aws/core/client/ClientConfiguration.h

@@ -524,8 +524,8 @@ namespace Aws
          * A helper function to initialize a retry strategy.
          * Default is DefaultRetryStrategy (i.e. exponential backoff)
          */
-        std::shared_ptr<RetryStrategy> InitRetryStrategy(Aws::String retryMode = "");
-        std::shared_ptr<RetryStrategy> InitRetryStrategy(int maxAttempts, Aws::String retryMode = "");
+        AWS_CORE_API std::shared_ptr<RetryStrategy> InitRetryStrategy(Aws::String retryMode = "");
+        AWS_CORE_API std::shared_ptr<RetryStrategy> InitRetryStrategy(int maxRetries, Aws::String retryMode = "");
 
         /**
          * A helper function to compute a user agent