correct merge conflict (#2293)

camunda · Jul 10, 2023 · 4b5fc4a · 4b5fc4a
1 parent d3dc1f4
commit 4b5fc4a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git 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) <Badge class="secondary" text="query"/>
-=======
-[`tasks`](/docs/apis-tools/tasklist-api/queries/tasks.mdx) <Badge class="secondary" text="query"/>
-
-> > > > > > > main:docs/apis-tools/tasklist-api/inputs/task-query.mdx
+[`tasks`](/apis-tools/tasklist-api/queries/tasks.mdx) <Badge class="secondary" text="query"/>
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
@@ -130,9 +130,4 @@ input TaskQuery {
 
 ### Member of
 
-<<<<<<< HEAD:docs/apis-tools/tasklist-api/inputs/task-query.mdx
-[`tasks`](../queries/tasks.mdx) <Badge class="secondary" text="query"/>
-=======
-[`tasks`](/docs/apis-tools/tasklist-api/queries/tasks.mdx) <Badge class="secondary" text="query"/>
-
-> > > > > > > main:docs/apis-tools/tasklist-api/inputs/task-query.mdx
+[`tasks`](/apis-tools/tasklist-api/queries/tasks.mdx) <Badge class="secondary" text="query"/>