From c6ef0dd966d8bf2025d51115510c03195960c9a9 Mon Sep 17 00:00:00 2001 From: joel Date: Thu, 15 Sep 2022 00:50:03 +0800 Subject: [PATCH 1/3] fixed merge marker error --- nodes/Plutio/descriptions/ProjectDescription.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nodes/Plutio/descriptions/ProjectDescription.ts b/nodes/Plutio/descriptions/ProjectDescription.ts index 5200aaa..8e29476 100644 --- a/nodes/Plutio/descriptions/ProjectDescription.ts +++ b/nodes/Plutio/descriptions/ProjectDescription.ts @@ -17,12 +17,12 @@ export const projectOperations: INodeProperties[] = [ }, }, options: [ - { - name: 'Chykalophia', - value: 'getCklph', - description: 'Get projects by contributor\'s email for CKLPH', - action: 'Get a project', - }, + // { + // name: 'Chykalophia', + // value: 'getCklph', + // description: 'Get projects by contributor\'s email for CKLPH', + // action: 'Get a project', + // }, { name: 'Copy', value: 'copy', -- 2.40.1 From 30bf56d941a697facde7f9bddea6bdddd1f8c33b Mon Sep 17 00:00:00 2001 From: joel Date: Thu, 15 Sep 2022 00:55:06 +0800 Subject: [PATCH 2/3] merge conflict --- nodes/Plutio/descriptions/ProjectDescription.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nodes/Plutio/descriptions/ProjectDescription.ts b/nodes/Plutio/descriptions/ProjectDescription.ts index 8e29476..5200aaa 100644 --- a/nodes/Plutio/descriptions/ProjectDescription.ts +++ b/nodes/Plutio/descriptions/ProjectDescription.ts @@ -17,12 +17,12 @@ export const projectOperations: INodeProperties[] = [ }, }, options: [ - // { - // name: 'Chykalophia', - // value: 'getCklph', - // description: 'Get projects by contributor\'s email for CKLPH', - // action: 'Get a project', - // }, + { + name: 'Chykalophia', + value: 'getCklph', + description: 'Get projects by contributor\'s email for CKLPH', + action: 'Get a project', + }, { name: 'Copy', value: 'copy', -- 2.40.1 From 99addde632903653bdc9bd401ee0a00f0a9f43ad Mon Sep 17 00:00:00 2001 From: joel Date: Thu, 15 Sep 2022 00:58:36 +0800 Subject: [PATCH 3/3] fixing merge conflict --- nodes/Plutio/descriptions/ProjectDescription.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nodes/Plutio/descriptions/ProjectDescription.ts b/nodes/Plutio/descriptions/ProjectDescription.ts index 5200aaa..8e29476 100644 --- a/nodes/Plutio/descriptions/ProjectDescription.ts +++ b/nodes/Plutio/descriptions/ProjectDescription.ts @@ -17,12 +17,12 @@ export const projectOperations: INodeProperties[] = [ }, }, options: [ - { - name: 'Chykalophia', - value: 'getCklph', - description: 'Get projects by contributor\'s email for CKLPH', - action: 'Get a project', - }, + // { + // name: 'Chykalophia', + // value: 'getCklph', + // description: 'Get projects by contributor\'s email for CKLPH', + // action: 'Get a project', + // }, { name: 'Copy', value: 'copy', -- 2.40.1