Fixed merge conflict.

Author: alda-optimizely

OptimizelySDKCore/OptimizelySDKCore/OPTLYEventDispatcher.m

@@ -71,7 +71,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