Skip to content

Commit

Permalink
fix(adm): conflict merge error
Browse files Browse the repository at this point in the history
  • Loading branch information
MrOrz committed Nov 25, 2024
1 parent 3e4080b commit 5cec2dc
Showing 1 changed file with 17 additions and 15 deletions.
32 changes: 17 additions & 15 deletions src/adm/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,23 @@ const router = createRouter({
...(shouldAuth ? [useAuth()] : []), // block non-cloudflare requests only in production
useAuditLog(),
],
}).route({
method: 'POST',
path: '/ping',
description:
'Please use this harmless endpoint to test if your connection with API is wired up correctly.',
schemas: {
request: {
json: Type.Object(
{
echo: Type.String({
description: 'Text that will be included in response message',
}),
},
{ additionalProperties: false }
),
})
.route({
method: 'POST',
path: '/ping',
description:
'Please use this harmless endpoint to test if your connection with API is wired up correctly.',
schemas: {
request: {
json: Type.Object(
{
echo: Type.String({
description: 'Text that will be included in response message',
}),
},
{ additionalProperties: false }
),
},
},
handler: async (request) =>
Response.json(pingHandler(await request.json())),
Expand Down

0 comments on commit 5cec2dc

Please sign in to comment.