Chykalophia/n8n-nodes-plutio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed merge conflict marker

Browse source
This commit is contained in:
Joel Sanguenza 2022-09-15 00:43:01 +08:00
parent ab691f648c
commit ed7dc578c5
3 changed files with 1 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nodes/Plutio/GenericFunctions.ts
View file

@ -59,11 +59,7 @@ async function plutioApiRequestToken(this: IExecuteFunctions | ILoadOptionsFunct
// Rest API function for plutio node.
export async function plutioApiRequest(this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, query: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
<<<<<<< HEAD
const endpoint = 'api.plutio.com/v1.10';
=======
const endpoint = 'api.plutio.com/v1.9';
>>>>>>> master
const credentials = await this.getCredentials('plutioApi');
const plutioApiToken = await plutioApiRequestToken.call(this);
const business = `${credentials.business}`;

2
nodes/Plutio/Plutio.node.ts
View file

@ -997,7 +997,7 @@ export class Plutio implements INodeType {
body.contributors = contributor as [string];
}
responseData = await plutioApiRequest.call(this, 'PUT', '/projects', body);;
responseData = await plutioApiRequest.call(this, 'PUT', '/projects', body);
}
if ('move' === operation) {
const _id = this.getNodeParameter('_id', 0) as string;