Fixed merge conflict.

alda-optimizely · alda-optimizely · commit b0a5a9507c59 · 2016-11-23T17:17:02.000-08:00
diff --git a/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventDispatcher.m b/OptimizelySDKCore/OptimizelySDKCore/OPTLYEventDispatcher.m
@@ -107,7 +107,6 @@ - (void)dispatchEvent:(NSDictionary *)params
 
 @end
 
->>>>>>> bring back a basic event dispatcher in core so that it works out of the box
 @implementation OPTLYEventDispatcherNoOp
 
 - (void)dispatchImpressionEvent:(nonnull NSDictionary *)params
