test merge

Revert "merge to master"
This reverts commit 6ea34f9bda.
2022-09-15 00:00:05 +08:00 · 2022-09-14 23:46:20 +08:00 · 2022-09-14 23:34:59 +08:00 · 2022-09-02 09:59:02 -05:00 · 2022-09-02 09:52:57 -05:00 · 2022-09-02 14:33:56 +00:00
1 changed files with 8 additions and 0 deletions
--- a/nodes/Plutio/GenericFunctions.ts
+++ b/nodes/Plutio/GenericFunctions.ts
@ -17,7 +17,11 @@ async function plutioApiRequestToken(this: IExecuteFunctions | ILoadOptionsFunct
 	const clientId = `${credentials.clientId}`;
 	const clientSecret = `${credentials.clientSecret}`;
 	const business = `${credentials.business}`;
+<<<<<<< HEAD
 	const endpoint = 'api.plutio.com/v1.10';
+=======
+	const endpoint = 'api.plutio.com/v1.9';
+>>>>>>> master
 	const returnData: IDataObject[] = [];

 	let responseData;
@ -58,7 +62,11 @@ 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}`;
Author	SHA1	Message	Date
Joel Sanguenza	4fc96b39ca	test merge	2022-09-15 00:00:05 +08:00
Joel Sanguenza	a53cda09d6	Revert "merge to master" This reverts commit `6ea34f9bda`.	2022-09-14 23:46:20 +08:00
Joel Sanguenza	6ea34f9bda	merge to master	2022-09-14 23:34:59 +08:00
Peter Krzyzek	a85a3d40a7	Updated readme to add info about cklph	2022-09-02 09:59:02 -05:00
Peter Krzyzek	8dbfbb1b8d	Initial commit to public repo	2022-09-02 09:52:57 -05:00
Peter Krzyzek	47b4fc9edc	Initial commit	2022-09-02 14:33:56 +00:00