From e94979caade3b29b4c12ccbc0e08f0ab54aafee9 Mon Sep 17 00:00:00 2001 From: LinkLeong Date: Fri, 18 Aug 2023 08:41:33 +0100 Subject: [PATCH] conflict resolution --- api/casaos/openapi.yaml | 16 ---------------- common/constants.go | 1 + 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/api/casaos/openapi.yaml b/api/casaos/openapi.yaml index 8b84d2791..2f77350c1 100644 --- a/api/casaos/openapi.yaml +++ b/api/casaos/openapi.yaml @@ -76,22 +76,6 @@ paths: "500": $ref: "#/components/responses/ResponseInternalServerError" - /health/logs: - get: - tags: - - Health methods - summary: Get log - operationId: getHealthlogs - responses: - "200": - description: OK - content: - application/octet-stream: - schema: - type: string - format: binary - "500": - $ref: "#/components/responses/ResponseInternalServerError" /file/test: get: tags: diff --git a/common/constants.go b/common/constants.go index 127f4d8fa..e7696abe6 100644 --- a/common/constants.go +++ b/common/constants.go @@ -4,4 +4,5 @@ const ( SERVICENAME = "casaos" VERSION = "0.4.4.1" BODY = " " + RANW_NAME = "IceWhale-RemoteAccess" )