nodes/Plutio/GenericFunctions.ts

@@ -17,11 +17,7 @@ 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;
@@ -62,11 +58,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}`;