Skip to content

Commit d5d0d25

Browse files
committed
Fix merge error
1 parent 21bba1f commit d5d0d25

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

BranchSDK.xcodeproj/project.pbxproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1658,11 +1658,6 @@
16581658
5F2211612894A34000C5B190 /* BNCUserAgentCollector.m in Sources */,
16591659
5F22113C2894A34000C5B190 /* BranchActivityItemProvider.m in Sources */,
16601660
5F2210D22894A34000C5B190 /* BranchOpenRequest.m in Sources */,
1661-
<<<<<<< HEAD
1662-
5F2211182894A34000C5B190 /* BranchUserCompletedActionRequest.m in Sources */,
1663-
=======
1664-
5F22113E2894A34000C5B190 /* BranchSetIdentityRequest.m in Sources */,
1665-
>>>>>>> master
16661661
);
16671662
runOnlyForDeploymentPostprocessing = 0;
16681663
};

0 commit comments

Comments
 (0)