From 50c2e2f388033a47106e1121a0fa45f4243fd28a Mon Sep 17 00:00:00 2001
From: Brian Giori <brian.giori@amplitude.com>
Date: Thu, 4 Apr 2024 16:57:42 -0700
Subject: [PATCH] fix merge conflict

---
 Tests/AmplitudeTests.m | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Tests/AmplitudeTests.m b/Tests/AmplitudeTests.m
index 1856b20b..67abcab1 100644
--- 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"];