merge conflicts

googleapis · May 7, 2024 · ce62231 · ce62231
1 parent 54385eb
commit ce62231
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 72 deletions.
diff --git a/discovery/aiplatform-v1.json b/discovery/aiplatform-v1.json
@@ -149,61 +149,6 @@
       "location": "me-west1",
       "description": "Locational Endpoint"
     },
-    {
-      "location": "me-west1",
-      "description": "Locational Endpoint",
-      "endpointUrl": "https://me-west1-aiplatform.googleapis.com/"
-    },
-    {
-      "endpointUrl": "https://northamerica-northeast1-aiplatform.googleapis.com/",
-      "location": "northamerica-northeast1",
-      "description": "Locational Endpoint"
-    },
-    {
-      "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",

diff --git a/discovery/aiplatform-v1beta1.json b/discovery/aiplatform-v1beta1.json
@@ -28,14 +28,11 @@
       "description": "Locational Endpoint",
       "location": "asia-east1",
       "endpointUrl": "https://asia-east1-aiplatform.googleapis.com/"
-<<<<<<< HEAD
     },
     {
       "description": "Locational Endpoint",
       "location": "asia-east1",
       "endpointUrl": "https://asia-east1-aiplatform.googleapis.com/"
-=======
->>>>>>> aefbfc725 (merge conflicts)
     },
     {
       "description": "Locational Endpoint",
@@ -46,25 +43,14 @@
       "location": "asia-northeast1",
       "endpointUrl": "https://asia-northeast1-aiplatform.googleapis.com/",
       "description": "Locational Endpoint"
-<<<<<<< HEAD
-=======
     },
     {
       "description": "Locational Endpoint",
       "endpointUrl": "https://asia-northeast2-aiplatform.googleapis.com/",
       "location": "asia-northeast2"
->>>>>>> aefbfc725 (merge conflicts)
     },
     {
       "description": "Locational Endpoint",
-<<<<<<< HEAD
-      "endpointUrl": "https://asia-northeast2-aiplatform.googleapis.com/",
-      "location": "asia-northeast2"
-    },
-    {
-      "description": "Locational Endpoint",
-=======
->>>>>>> aefbfc725 (merge conflicts)
       "endpointUrl": "https://asia-northeast3-aiplatform.googleapis.com/",
       "location": "asia-northeast3"
     },
@@ -161,14 +147,11 @@
     {
       "endpointUrl": "https://me-west1-aiplatform.googleapis.com/",
       "location": "me-west1",
-<<<<<<< HEAD
       "description": "Locational Endpoint"
     },
     {
       "endpointUrl": "https://me-west1-aiplatform.googleapis.com/",
       "location": "me-west1",
-=======
->>>>>>> aefbfc725 (merge conflicts)
       "description": "Locational Endpoint"
     },
     {