update docs

Automattic · Jun 1, 2023 · 9d5e75e · 9d5e75e
1 parent e5f72f6
commit 9d5e75e
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/...php/core-api/wpcom-endpoints/test-class-wpcom-rest-api-v2-endpoint-send-email-preview.php b/...php/core-api/wpcom-endpoints/test-class-wpcom-rest-api-v2-endpoint-send-email-preview.php
@@ -88,11 +88,7 @@ public function mock_jetpack_private_options() {
 	}
 
 	/**
-<<<<<<< HEAD
-	 * Test that a non wp.com connecte user shouldn't be able to use the endpoint.
-=======
-	 * Test if the user has a valid token for this blog.
->>>>>>> 6634c6eabe ([not verified] Add Send Email Preview endpoint)
+	 * Test that a non wp.com connected user shouldn't be able to use the endpoint.
 	 *
 	 * @covers ::permissions_check
 	 */
@@ -111,11 +107,7 @@ public function test_email_preview_permissions_check_wrong_user() {
 	}
 
 	/**
-<<<<<<< HEAD
 	 * Test that a subscriber shouldn't be able to use the endpoint.
-=======
-	 * Test if the user can preview emails on this blog.
->>>>>>> 6634c6eabe ([not verified] Add Send Email Preview endpoint)
 	 *
 	 * @covers ::permissions_check
 	 */