fix: resolve a conflict in tests

googleapis · Nov 2, 2023 · 3eb4047 · 3eb4047
1 parent 090674f
commit 3eb4047
Showing 1 changed file with 1 addition and 12 deletions.
diff --git a/oauth2_http/javatests/com/google/auth/oauth2/ServiceAccountCredentialsTest.java b/oauth2_http/javatests/com/google/auth/oauth2/ServiceAccountCredentialsTest.java
@@ -601,21 +601,10 @@ public void fromJSON_tokenServerUri() throws IOException {
   public void fromJson_hasQuotaProjectId() throws IOException {
     MockTokenServerTransportFactory transportFactory = new MockTokenServerTransportFactory();
     transportFactory.transport.addServiceAccount(CLIENT_EMAIL, ACCESS_TOKEN);
-<<<<<<< HEAD
-    GenericJson json =
-        writeServiceAccountJson(
-            CLIENT_ID,
-            CLIENT_EMAIL,
-            PRIVATE_KEY_PKCS8,
-            PRIVATE_KEY_ID,
-            PROJECT_ID,
-            QUOTA_PROJECT,
-            null);
-=======
     GenericJson json = writeServiceAccountJson(PROJECT_ID, QUOTA_PROJECT, null);
->>>>>>> 7959a6c (fix: move universe_domain to very base Credential, tests cleanup)
     GoogleCredentials credentials = ServiceAccountCredentials.fromJson(json, transportFactory);
     credentials = credentials.createScoped(SCOPES);
+
     Map<String, List<String>> metadata = credentials.getRequestMetadata(CALL_URI);
 
     assertTrue(metadata.containsKey(GoogleCredentials.QUOTA_PROJECT_ID_HEADER_KEY));