Got rid of some more merge conflict lines.

Author: alda-optimizely

OptimizelySDKCore/OptimizelySDKCore/OPTLYVariable.h

@@ -18,9 +18,6 @@
 #import <JSONModel/JSONModelLib.h>
 
 /**
-<<<<<<< HEAD
- * This class is a representation of an Optimizely live variable.
-=======
  * This class is a representation of an Optimizely live variable scoped within a project:
  *   "variables": [
  *    {
@@ -31,7 +28,6 @@
  *    },
  *     ...
  *    ]
->>>>>>> alda/userProfile
  */
 
 @protocol OPTLYVariable

OptimizelyiOSDemoApp/OptimizelyiOSDemoApp/AppDelegate.swift

@@ -93,15 +93,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 let jsonData = fileContents.data(using: String.Encoding.utf8)!
                 print(fileContents)
 
-<<<<<<< HEAD
-=======
                 let projectConfig = OPTLYProjectConfig.initWithBuilderBlock({ (builder) in
                     builder?.datafile = jsonData
                     builder?.userProfile = OPTLYUserProfile.init()
                 });
                 print("projectConfig: ", projectConfig)
 
->>>>>>> alda/userProfile
                 let eventDispatcherBuilderBlock : OPTLYEventDispatcherBuilderBlock = {(builder)in
                     builder?.eventDispatcherDispatchInterval = self.eventDispatcherDispatchInterval
                 }
@@ -110,10 +107,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 optimizely = (Optimizely.initWithBuilderBlock({(builder)in
                     builder!.datafile = jsonData
                     builder!.eventDispatcher = eventDispatcher
-<<<<<<< HEAD
-=======
                     builder!.userProfile = OPTLYUserProfile.init()
->>>>>>> alda/userProfile
                 }))
             } catch {
                 print("invalid json data")

OptimizelyiOSDemoApp/OptimizelyiOSDemoAppTests/Test Data/test_data_10_experiments.json

@@ -1,5 +1 @@
-<<<<<<< HEAD
-{"experiments": [{"status": "Running", "layerId": "1234", "key": "testExperiment4", "trafficAllocation": [{"entityId": "6373141147", "endOfRange": 5000}, {"entityId": "6373141148", "endOfRange": 10000}], "audienceIds": [], "variations": [{"id": "6373141147", "key": "control"}, {"id": "6373141148", "key": "variation"}], "forcedVariations": {}, "id": "6358043286"}, {"status": "Running", "layerId": "1234", "key": "testExperiment5", "trafficAllocation": [{"entityId": "6335242053", "endOfRange": 5000}, {"entityId": "6335242054", "endOfRange": 10000}], "audienceIds": [], "variations": [{"id": "6335242053", "key": "control"}, {"id": "6335242054", "key": "variation"}], "forcedVariations": {}, "id": "6364835526"}, {"status": "Paused", "layerId": "1234", "key": "testExperimentNotRunning", "trafficAllocation": [{"entityId": "6377281127", "endOfRange": 5000}, {"entityId": "6377281128", "endOfRange": 10000}], "audienceIds": [], "variations": [{"id": "6377281127", "key": "control"}, {"id": "6377281128", "key": "variation"}], "forcedVariations": {}, "id": "6367444440"}, {"status": "Running", "layerId": "1234", "key": "testExperiment1", "trafficAllocation": [{"entityId": "6384330451", "endOfRange": 5000}, {"entityId": "6384330452", "endOfRange": 10000}], "audienceIds": [], "variations": [{"id": "6384330451", "key": "control"}, {"id": "6384330452", "key": "variation"}], "forcedVariations": {"variation_user": "variation", "control_user": "control"}, "id": "6367863211"}, {"status": "Running", "layerId": "1234", "key": "testExperiment3", "trafficAllocation": [{"entityId": "6376141758", "endOfRange": 5000}, {"entityId": "6376141759", "endOfRange": 10000}], "audienceIds": [], "variations": [{"id": "6376141758", "key": "control"}, {"id": "6376141759", "key": "variation"}], "forcedVariations": {}, "id": "6370392407"}, {"status": "Running", "layerId": "1234", "key": "testExperiment6", "trafficAllocation": [{"entityId": "6379060914", "endOfRange": 5000}, {"entityId": "6379060915", "endOfRange": 10000}], "audienceIds": [], "variations": [{"id": "6379060914", "key": "control"}, {"id": "6379060915", "key": "variation"}], "forcedVariations": {"forced_variation_user": "variation"}, "id": "6370821515"}, {"status": "Running", "layerId": "1234", "key": "testExperiment2", "trafficAllocation": [{"entityId": "6386700062", "endOfRange": 5000}, {"entityId": "6386700063", "endOfRange": 10000}], "audienceIds": [], "variations": [{"id": "6386700062", "key": "control"}, {"id": "6386700063", "key": "variation"}], "forcedVariations": {"variation_user": "variation", "control_user": "control"}, "id": "6376870125"}, {"status": "Running", "layerId": "1234", "key": "testExperimentWithFirefoxAudience", "trafficAllocation": [{"entityId": "6333082303", "endOfRange": 5000}, {"entityId": "6333082304", "endOfRange": 10000}], "audienceIds": ["6369992312"], "variations": [{"id": "6333082303", "key": "control"}, {"id": "6333082304", "key": "variation"}], "forcedVariations": {}, "id": "6383811281"}], "version": "1", "audiences": [{"conditions": "[\"and\", [\"or\", [\"or\", {\"name\": \"browser_type\", \"type\": \"custom_dimension\", \"value\": \"safari\"}]]]", "id": "6352892614", "name": "Safari users"}, {"conditions": "[\"and\", [\"or\", [\"or\", {\"name\": \"browser_type\", \"type\": \"custom_dimension\", \"value\": \"android\"}]]]", "id": "6355234780", "name": "Android users"}, {"conditions": "[\"and\", [\"or\", [\"or\", {\"name\": \"browser_type\", \"type\": \"custom_dimension\", \"value\": \"desktop\"}]]]", "id": "6360574256", "name": "Desktop users"}, {"conditions": "[\"and\", [\"or\", [\"or\", {\"name\": \"browser_type\", \"type\": \"custom_dimension\", \"value\": \"opera\"}]]]", "id": "6365864533", "name": "Opera users"}, {"conditions": "[\"and\", [\"or\", [\"or\", {\"name\": \"browser_type\", \"type\": \"custom_dimension\", \"value\": \"tablet\"}]]]", "id": "6369831151", "name": "Tablet users"}, {"conditions": "[\"and\", [\"or\", [\"or\", {\"name\": \"browser_type\", \"type\": \"custom_dimension\", \"value\": \"firefox\"}]]]", "id": "6369992312", "name": "Firefox users"}, {"conditions": "[\"and\", [\"or\", [\"or\", {\"name\": \"browser_type\", \"type\": \"custom_dimension\", \"value\": \"chrome\"}]]]", "id": "6373141157", "name": "Chrome users"}, {"conditions": "[\"and\", [\"or\", [\"or\", {\"name\": \"browser_type\", \"type\": \"custom_dimension\", \"value\": \"ie\"}]]]", "id": "6378191386", "name": "IE users"}], "attributes": [{"id": "6359881003", "key": "browser_type"}], "groups": [{"policy": "random", "trafficAllocation": [], "experiments": [], "id": "6367902163"}, {"policy": "random", "trafficAllocation": [], "experiments": [], "id": "6393150032"}, {"policy": "random", "trafficAllocation": [{"entityId": "6450630664", "endOfRange": 5000}, {"entityId": "6447021179", "endOfRange": 10000}], "experiments": [{"status": "Running", "layerId": "1234",  "key": "mutex_exp2", "trafficAllocation": [{"entityId": "6453410972", "endOfRange": 5000}, {"entityId": "6453410973", "endOfRange": 10000}], "audienceIds": [], "variations": [{"id": "6453410972", "key": "a"}, {"id": "6453410973", "key": "b"}], "forcedVariations": {"user_b": "b", "user_a": "a"}, "id": "6447021179"}, {"status": "Running", "layerId": "1234",  "key": "mutex_exp1", "trafficAllocation": [{"entityId": "6451680205", "endOfRange": 5000}, {"entityId": "6451680206", "endOfRange": 10000}], "audienceIds": [], "variations": [{"id": "6451680205", "key": "a"}, {"id": "6451680206", "key": "b"}], "forcedVariations": {}, "id": "6450630664"}], "id": "6436903041"}], "projectId": "6377970066", "accountId": "6365361536", "events": [{"experimentIds": ["6450630664", "6447021179"], "id": "6370392432", "key": "testEventWithMultipleGroupedExperiments"}, {"experimentIds": ["6367863211"], "id": "6372590948", "key": "testEvent"}, {"experimentIds": ["6364835526", "6450630664", "6367863211", "6376870125", "6383811281", "6358043286", "6370392407", "6367444440", "6370821515", "6447021179"], "id": "6372952486", "key": "testEventWithMultipleExperiments"}, {"experimentIds": ["6367444440"], "id": "6380961307", "key": "testEventWithExperimentNotRunning"}, {"experimentIds": ["6383811281"], "id": "6384781388", "key": "testEventWithAudiences"}, {"experimentIds": [], "id": "6386521015", "key": "testEventWithoutExperiments"}, {"experimentIds": ["6450630664", "6383811281", "6376870125"], "id": "6316734272", "key": "Total Revenue"}], "revision": "83"}
-=======
 {"experiments": [{"status": "Running", "layerId": "1234", "key": "testExperiment4", "trafficAllocation": [{"entityId": "6373141147", "endOfRange": 5000}, {"entityId": "6373141148", "endOfRange": 10000}], "audienceIds": [], "variations": [{"id": "6373141147", "key": "control", "variables": []}, {"id": "6373141148", "key": "variation", "variables": []}], "forcedVariations": {}, "id": "6358043286"}, {"status": "Running", "layerId": "1234", "key": "testExperiment5", "trafficAllocation": [{"entityId": "6335242053", "endOfRange": 5000}, {"entityId": "6335242054", "endOfRange": 10000}], "audienceIds": [], "variations": [{"id": "6335242053", "key": "control", "variables": []}, {"id": "6335242054", "key": "variation", "variables": []}], "forcedVariations": {}, "id": "6364835526"}, {"status": "Paused", "layerId": "1234", "key": "testExperimentNotRunning", "trafficAllocation": [{"entityId": "6377281127", "endOfRange": 5000}, {"entityId": "6377281128", "endOfRange": 10000}], "audienceIds": [], "variations": [{"id": "6377281127", "key": "control", "variables": []}, {"id": "6377281128", "key": "variation", "variables": []}], "forcedVariations": {}, "id": "6367444440"}, {"status": "Running", "layerId": "1234", "key": "testExperiment1", "trafficAllocation": [{"entityId": "6384330451", "endOfRange": 5000}, {"entityId": "6384330452", "endOfRange": 10000}], "audienceIds": [], "variations": [{"id": "6384330451", "key": "control", "variables": []}, {"id": "6384330452", "key": "variation", "variables": []}], "forcedVariations": {"variation_user": "variation", "control_user": "control"}, "id": "6367863211"}, {"status": "Running", "layerId": "1234", "key": "testExperiment3", "trafficAllocation": [{"entityId": "6376141758", "endOfRange": 5000}, {"entityId": "6376141759", "endOfRange": 10000}], "audienceIds": [], "variations": [{"id": "6376141758", "key": "control", "variables": []}, {"id": "6376141759", "key": "variation", "variables": []}], "forcedVariations": {}, "id": "6370392407"}, {"status": "Running", "layerId": "1234", "key": "testExperiment6", "trafficAllocation": [{"entityId": "6379060914", "endOfRange": 5000}, {"entityId": "6379060915", "endOfRange": 10000}], "audienceIds": [], "variations": [{"id": "6379060914", "key": "control", "variables": []}, {"id": "6379060915", "key": "variation", "variables": []}], "forcedVariations": {"forced_variation_user": "variation"}, "id": "6370821515"}, {"status": "Running", "layerId": "1234", "key": "testExperiment2", "trafficAllocation": [{"entityId": "6386700062", "endOfRange": 5000}, {"entityId": "6386700063", "endOfRange": 10000}], "audienceIds": [], "variations": [{"id": "6386700062", "key": "control", "variables": []}, {"id": "6386700063", "key": "variation", "variables": []}], "forcedVariations": {"variation_user": "variation", "control_user": "control"}, "id": "6376870125"}, {"status": "Running", "layerId": "1234", "key": "testExperimentWithFirefoxAudience", "trafficAllocation": [{"entityId": "6333082303", "endOfRange": 5000}, {"entityId": "6333082304", "endOfRange": 10000}], "audienceIds": ["6369992312"], "variations": [{"id": "6333082303", "key": "control", "variables": [{"id": "6384881128", "value": "Hello"}, {"id": "6384881125", "value": "False"}, {"id": "63234881124", "value": "8"}, {"id": "6684886128", "value": "1.8"}]}, {"id": "6333082304", "key": "variation", "variables": [{"id": "6384881128", "value": "Goodbye"}, {"id": "6384881125", "value": "True"}, {"id": "63234881124", "value": "2"}, {"id": "6684886128", "value": "2.8"}]}], "forcedVariations": {}, "id": "6383811281"}], "version": "1", "audiences": [{"conditions": "[\"and\", [\"or\", [\"or\", {\"name\": \"browser_type\", \"type\": \"custom_dimension\", \"value\": \"safari\"}]]]", "id": "6352892614", "name": "Safari users"}, {"conditions": "[\"and\", [\"or\", [\"or\", {\"name\": \"browser_type\", \"type\": \"custom_dimension\", \"value\": \"android\"}]]]", "id": "6355234780", "name": "Android users"}, {"conditions": "[\"and\", [\"or\", [\"or\", {\"name\": \"browser_type\", \"type\": \"custom_dimension\", \"value\": \"desktop\"}]]]", "id": "6360574256", "name": "Desktop users"}, {"conditions": "[\"and\", [\"or\", [\"or\", {\"name\": \"browser_type\", \"type\": \"custom_dimension\", \"value\": \"opera\"}]]]", "id": "6365864533", "name": "Opera users"}, {"conditions": "[\"and\", [\"or\", [\"or\", {\"name\": \"browser_type\", \"type\": \"custom_dimension\", \"value\": \"tablet\"}]]]", "id": "6369831151", "name": "Tablet users"}, {"conditions": "[\"and\", [\"or\", [\"or\", {\"name\": \"browser_type\", \"type\": \"custom_dimension\", \"value\": \"firefox\"}]]]", "id": "6369992312", "name": "Firefox users"}, {"conditions": "[\"and\", [\"or\", [\"or\", {\"name\": \"browser_type\", \"type\": \"custom_dimension\", \"value\": \"chrome\"}]]]", "id": "6373141157", "name": "Chrome users"}, {"conditions": "[\"and\", [\"or\", [\"or\", {\"name\": \"browser_type\", \"type\": \"custom_dimension\", \"value\": \"ie\"}]]]", "id": "6378191386", "name": "IE users"}], "attributes": [{"id": "6359881003", "key": "browser_type"}], "groups": [{"policy": "random", "trafficAllocation": [], "experiments": [], "id": "6367902163"}, {"policy": "random", "trafficAllocation": [], "experiments": [], "id": "6393150032"}, {"policy": "random", "trafficAllocation": [{"entityId": "6450630664", "endOfRange": 5000}, {"entityId": "6447021179", "endOfRange": 10000}], "experiments": [{"status": "Running", "layerId": "1234", "key": "mutex_exp2", "trafficAllocation": [{"entityId": "6453410972", "endOfRange": 5000}, {"entityId": "6453410973", "endOfRange": 10000}], "audienceIds": [], "variations": [{"id": "6453410972", "key": "a", "variables": [{"id": "73483201090", "value": "Guten tag"}, {"id": "73483201091", "value": "False"}, {"id": "73483201092", "value": "10"}, {"id": "73483201093", "value": "35.5"}]}, {"id": "6453410973", "key": "b", "variables": [{"id": "73483201090", "value": "Ciao"}, {"id": "73483201091", "value": "True"}, {"id": "73483201092", "value": "90"}, {"id": "73483201093", "value": "75.5"}]}], "forcedVariations": {"user_b": "b", "user_a": "a"}, "id": "6447021179"}, {"status": "Running", "layerId": "1234", "key": "mutex_exp1", "trafficAllocation": [{"entityId": "6451680205", "endOfRange": 5000}, {"entityId": "6451680206", "endOfRange": 10000}], "audienceIds": [], "variations": [{"id": "6451680205", "key": "a", "variables": [{"id": "73483201090", "value": "Mambo"}, {"id": "73483201091", "value": "False"}, {"id": "73483201092", "value": "50"}, {"id": "73483201093", "value": "150.5"}]}, {"id": "6451680206", "key": "b", "variables": [{"id": "73483201090", "value": "Hola"}, {"id": "73483201091", "value": "True"}, {"id": "73483201092", "value": "20"}, {"id": "73483201093", "value": "250.5"}]}], "forcedVariations": {}, "id": "6450630664"}], "id": "6436903041"}], "projectId": "6377970066", "accountId": "6365361536", "events": [{"experimentIds": ["6450630664", "6447021179"], "id": "6370392432", "key": "testEventWithMultipleGroupedExperiments"}, {"experimentIds": ["6367863211"], "id": "6372590948", "key": "testEvent"}, {"experimentIds": ["6364835526", "6450630664", "6367863211", "6376870125", "6383811281", "6358043286", "6370392407", "6367444440", "6370821515", "6447021179"], "id": "6372952486", "key": "testEventWithMultipleExperiments"}, {"experimentIds": ["6367444440"], "id": "6380961307", "key": "testEventWithExperimentNotRunning"}, {"experimentIds": ["6383811281"], "id": "6384781388", "key": "testEventWithAudiences"}, {"experimentIds": [], "id": "6386521015", "key": "testEventWithoutExperiments"}, {"experimentIds": ["6450630664", "6383811281", "6376870125"], "id": "6316734272", "key": "Total Revenue"}], "variables": [{"id": "6384881128", "key": "someString", "type": "string", "value": "defaultStringValue"}, {"id": "6384881125", "key": "someBoolean", "type": "bool", "value": "False"}, {"id": "63234881124", "key": "someInteger", "type": "integer", "value": "1"}, {"id": "6684886128", "key": "someFloat", "type": "float", "value": "0.5"}, {"id": "73483201090", "key": "someStringForGroupedExperiment", "type": "string", "value": "Bonjour"}, {"id": "73483201091", "key": "someBooleanForGroupedExperiment", "type": "boolean", "value": "True"}, {"id": "73483201092", "key": "someIntegerForGroupedExperiment", "type": "integer", "value": "100"}, {"id": "73483201093", "key": "someFloatForGroupedExperiment", "type": "float", "value": "300.5"}], "revision": "83"}
->>>>>>> alda/userProfile