From 4b5fc4a20fb9678365b1c2cef7e2d69f83f45324 Mon Sep 17 00:00:00 2001 From: Amara Graham Date: Mon, 10 Jul 2023 08:22:09 -0500 Subject: [PATCH] correct merge conflict (#2293) --- docs/apis-tools/tasklist-api/inputs/task-query.mdx | 7 +------ .../apis-tools/tasklist-api/inputs/task-query.mdx | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/docs/apis-tools/tasklist-api/inputs/task-query.mdx b/docs/apis-tools/tasklist-api/inputs/task-query.mdx index 74d1ab1f8f..b19a391a76 100644 --- a/docs/apis-tools/tasklist-api/inputs/task-query.mdx +++ b/docs/apis-tools/tasklist-api/inputs/task-query.mdx @@ -130,9 +130,4 @@ input TaskQuery { ### Member of -<<<<<<< HEAD:docs/apis-tools/tasklist-api/inputs/task-query.mdx -[`tasks`](../queries/tasks.mdx) -======= -[`tasks`](/docs/apis-tools/tasklist-api/queries/tasks.mdx) - -> > > > > > > main:docs/apis-tools/tasklist-api/inputs/task-query.mdx +[`tasks`](/apis-tools/tasklist-api/queries/tasks.mdx) diff --git a/versioned_docs/version-8.2/apis-tools/tasklist-api/inputs/task-query.mdx b/versioned_docs/version-8.2/apis-tools/tasklist-api/inputs/task-query.mdx index 74d1ab1f8f..b19a391a76 100644 --- a/versioned_docs/version-8.2/apis-tools/tasklist-api/inputs/task-query.mdx +++ b/versioned_docs/version-8.2/apis-tools/tasklist-api/inputs/task-query.mdx @@ -130,9 +130,4 @@ input TaskQuery { ### Member of -<<<<<<< HEAD:docs/apis-tools/tasklist-api/inputs/task-query.mdx -[`tasks`](../queries/tasks.mdx) -======= -[`tasks`](/docs/apis-tools/tasklist-api/queries/tasks.mdx) - -> > > > > > > main:docs/apis-tools/tasklist-api/inputs/task-query.mdx +[`tasks`](/apis-tools/tasklist-api/queries/tasks.mdx)