Updated logs.

Author: alda-optimizely

OptimizelySDKCore/OptimizelySDKCore/OPTLYErrorHandlerMessages.h

@@ -61,6 +61,7 @@ typedef NS_ENUM(NSUInteger, OPTLYErrorTypes) {
     OPTLYErrorTypesEventDispatch,
     OPTLYErrorTypesEventTrack,
     OPTLYErrorTypesUserActivate,
+    OPTLYErrorTypesUserProfile,
 };
 
 @interface OPTLYErrorHandlerMessages : NSObject

OptimizelySDKCore/OptimizelySDKCore/OPTLYLoggerMessages.m

@@ -63,6 +63,7 @@
 NSString *const OPTLYLoggerMessagesGroupUnknownForGroupId = @"Group not found for group id: %@."; // group id
 NSString *const OPTLYLoggerMessagesVariationUnknownForVariationKey = @"Unknown variation for variation key: %@."; // variation key
 NSString *const OPTLYLoggerMessagesVariableUnknownForVariableKey = @"Live variable not found for variable key: %@."; // live variable key
+NSString *const OPTLYLoggerMessagesVariationUnknownForVariationKey = @"Unknown variation for variation key: %@."; // variation key
 NSString *const OPTLYLoggerMessagesEventDispatcherInterval = @"Event dispatcher interval set: %ld";
 
 // ---- Debug ----

OptimizelySDKCore/OptimizelySDKCore/OPTLYProjectConfig.m

@@ -26,16 +26,9 @@
 #import "OPTLYLogger.h"
 #import "OPTLYProjectConfig.h"
 #import "OPTLYValidator.h"
-<<<<<<< HEAD
 #import "OPTLYUserProfile.h"
 #import "OPTLYVariable.h"
 #import "OPTLYUserProfile.h"
-<<<<<<< HEAD
-=======
-#import "OPTLYVariable.h"
->>>>>>> Introduce live variable class and getters (#35)
-=======
->>>>>>> User profile feature.
 
 NSString * const kClientEngine             = @"objective-c-sdk-core";
 
@@ -94,6 +87,9 @@ - (nullable instancetype)initWithDatafile:(nullable NSData *)datafile
     if (userProfile) {
         if ([OPTLYUserProfile conformsToOPTLYUserProfileProtocol:[userProfile class]]) {
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Updated logs.
             _userProfile = (id<OPTLYUserProfile, Ignore>)userProfile;
         } else {
             NSError *error = [NSError errorWithDomain:OPTLYErrorHandlerMessagesDomain
@@ -104,12 +100,16 @@ - (nullable instancetype)initWithDatafile:(nullable NSData *)datafile
 
             NSString *logMessage = OPTLYErrorHandlerMessagesUserProfileInvalid;
             [_logger logMessage:logMessage withLevel:OptimizelyLogLevelError];
+<<<<<<< HEAD
         }
 =======
             _userProfile = userProfile;
         }
         // TODO - log error
 >>>>>>> User profile feature.
+=======
+        }
+>>>>>>> Updated logs.
     }
 
     OPTLYProjectConfig* projectConfig = nil;