From fafe436550ed1e7a868d4b0f29e49d9f2508a533 Mon Sep 17 00:00:00 2001
From: Anthony Chang <anthony.chang@memsource.com>
Date: Thu, 30 Nov 2023 15:19:33 +0100
Subject: [PATCH] fix merge conflicts

---
 doc/compiled.json                          | 22 +++++-----------------
 paths/custom_metadata_properties/show.yaml |  4 ++--
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/doc/compiled.json b/doc/compiled.json
index bec8b70d..2186383f 100644
--- a/doc/compiled.json
+++ b/doc/compiled.json
@@ -733,9 +733,6 @@
               "$ref": "#/components/schemas/project_short"
             }
           },
-          "account": {
-            "$ref": "#/components/schemas/account"
-          },
           "created_at": {
             "type": "string",
             "format": "date-time"
@@ -755,6 +752,8 @@
             "username": "joe.doe",
             "name": "Joe Doe"
           },
+          "created_at": "2015-01-28T09:52:53Z",
+          "updated_at": "2015-01-28T09:52:53Z",
           "projects": [
             {
               "id": "abcd1234cdef1234abcd1234cdef1234",
@@ -763,18 +762,7 @@
               "created_at": "2015-01-28T09:52:53Z",
               "updated_at": "2015-01-28T09:52:53Z"
             }
-          ],
-          "account": {
-            "id": "abcd1234",
-            "name": "Company Account",
-            "slug": "company_account",
-            "company": "My Awesome Company",
-            "created_at": "2015-01-28T09:52:53Z",
-            "updated_at": "2015-01-28T09:52:53Z",
-            "company_logo_url": "http://assets.example.com/company_logo.png"
-          },
-          "created_at": "2015-01-28T09:52:53Z",
-          "updated_at": "2015-01-28T09:52:53Z"
+          ]
         }
       },
       "key_preview": {
@@ -6182,7 +6170,7 @@
       "get": {
         "summary": "Get a single property",
         "description": "Get details of a single custom property.",
-        "operationId": "custom_metadata_label/show",
+        "operationId": "custom_metadata_property/show",
         "tags": [
           "Custom Metadata"
         ],
@@ -6212,7 +6200,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/custom_metadata_label"
+                  "$ref": "#/components/schemas/custom_metadata_property"
                 }
               }
             },
diff --git a/paths/custom_metadata_properties/show.yaml b/paths/custom_metadata_properties/show.yaml
index a13057cd..10c41682 100644
--- a/paths/custom_metadata_properties/show.yaml
+++ b/paths/custom_metadata_properties/show.yaml
@@ -1,7 +1,7 @@
 ---
 summary: Get a single property
 description: Get details of a single custom property.
-operationId: custom_metadata_label/show
+operationId: custom_metadata_property/show
 tags:
 - Custom Metadata
 parameters:
@@ -20,7 +20,7 @@ responses:
     content:
       application/json:
         schema:
-          "$ref": "../../schemas/custom_metadata_label.yaml#/custom_metadata_label"
+          "$ref": "../../schemas/custom_metadata_property.yaml#/custom_metadata_property"
     headers:
       X-Rate-Limit-Limit:
         "$ref": "../../headers.yaml#/X-Rate-Limit-Limit"