Fix Merge Issue around getUserIdentities

BrandonStalnaker · BrandonStalnaker · commit 0b92d11e6901 · 2020-10-14T10:06:28.000-04:00
diff --git a/ios/RNMParticle/RNMParticle.m b/ios/RNMParticle/RNMParticle.m
@@ -308,7 +308,7 @@ + (void)load {
 {
     MParticleUser *selectedUser = [[MParticleUser alloc] init];
     selectedUser.userId = [NSNumber numberWithLong:userId.longLongValue];
-    completion(@[[NSNull null], [selectedUser userIdentities]]);
+    completion(@[[NSNull null], [selectedUser identities]]);
 }
 
 RCT_EXPORT_METHOD(getFirstSeen:(NSString *)userId completion:(RCTResponseSenderBlock)completion)

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ + (void)load {`
`308`	`308`	`{`
`309`	`309`	`MParticleUser *selectedUser = [[MParticleUser alloc] init];`
`310`	`310`	`selectedUser.userId = [NSNumber numberWithLong:userId.longLongValue];`
`311`		`- completion(@[[NSNull null], [selectedUser userIdentities]]);`
	`311`	`+ completion(@[[NSNull null], [selectedUser identities]]);`
`312`	`312`	`}`
`313`	`313`
`314`	`314`	`RCT_EXPORT_METHOD(getFirstSeen:(NSString *)userId completion:(RCTResponseSenderBlock)completion)`