merge conflicts

googleapis · May 7, 2024 · f6671e2 · f6671e2
1 parent ce62231
commit f6671e2
Showing 1 changed file with 62 additions and 0 deletions.
diff --git a/discovery/aiplatform-v1.json b/discovery/aiplatform-v1.json
@@ -90,18 +90,28 @@
       "description": "Locational Endpoint"
     },
     {
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+=======
+>>>>>>> 622c27386 (merge conflicts)
       "endpointUrl": "https://europe-southwest1-aiplatform.googleapis.com/",
       "location": "europe-southwest1",
       "description": "Locational Endpoint"
     },
     {
+<<<<<<< HEAD
+=======
+>>>>>>> fa2a9177f (feat(aiplatform)!: update the API)
+>>>>>>> 622c27386 (merge conflicts)
       "location": "europe-west1",
       "endpointUrl": "https://europe-west1-aiplatform.googleapis.com/",
       "description": "Locational Endpoint"
     },
     {
       "location": "europe-west2",
       "endpointUrl": "https://europe-west2-aiplatform.googleapis.com/",
+<<<<<<< HEAD
       "description": "Locational Endpoint"
     },
     {
@@ -155,6 +165,58 @@
       "endpointUrl": "https://northamerica-northeast1-aiplatform.googleapis.com/"
     },
     {
+      "description": "Locational Endpoint",
+      "location": "europe-west3",
+      "endpointUrl": "https://europe-west3-aiplatform.googleapis.com/"
+    },
+    {
+      "endpointUrl": "https://europe-west4-aiplatform.googleapis.com/",
+      "location": "europe-west4",
+      "description": "Locational Endpoint"
+    },
+    {
+      "location": "europe-west6",
+      "endpointUrl": "https://europe-west6-aiplatform.googleapis.com/",
+      "description": "Locational Endpoint"
+    },
+    {
+      "location": "europe-west8",
+      "endpointUrl": "https://europe-west8-aiplatform.googleapis.com/",
+      "description": "Locational Endpoint"
+    },
+    {
+      "description": "Locational Endpoint",
+      "endpointUrl": "https://europe-west9-aiplatform.googleapis.com/",
+      "location": "europe-west9"
+    },
+    {
+      "endpointUrl": "https://europe-west12-aiplatform.googleapis.com/",
+      "description": "Locational Endpoint",
+      "location": "europe-west12"
+    },
+    {
+      "location": "me-central1",
+      "description": "Locational Endpoint",
+      "endpointUrl": "https://me-central1-aiplatform.googleapis.com/"
+    },
+    {
+      "location": "me-central2",
+      "description": "Locational Endpoint",
+      "endpointUrl": "https://me-central2-aiplatform.googleapis.com/"
+    },
+    {
+      "endpointUrl": "https://me-west1-aiplatform.googleapis.com/",
+      "location": "me-west1",
+      "description": "Locational Endpoint"
+    },
+    {
+      "description": "Locational Endpoint",
+      "location": "northamerica-northeast1",
+      "endpointUrl": "https://northamerica-northeast1-aiplatform.googleapis.com/"
+    },
+    {
+>>>>>>> fa2a9177f (feat(aiplatform)!: update the API)
+>>>>>>> 622c27386 (merge conflicts)
       "endpointUrl": "https://northamerica-northeast2-aiplatform.googleapis.com/",
       "location": "northamerica-northeast2"
     },