fix merge conflict

amplitude · Apr 4, 2024 · 50c2e2f · 50c2e2f
1 parent bc7398e
commit 50c2e2f
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/Tests/AmplitudeTests.m b/Tests/AmplitudeTests.m
@@ -1170,11 +1170,6 @@ - (void)testCustomizedLibraryWithNilLibraryAndVersion {
     XCTAssertEqualObjects(currentLibraryValue, targetLibraryValue);
 }
 
-<<<<<<< HEAD
-<<<<<<< Updated upstream
-=======
-=======
->>>>>>> main
 - (void)testSetPlan {
     Amplitude *client = [Amplitude instanceWithName:@"observe_plan"];
     [client initializeApiKey:@"tracking_plan"];