nodes/Plutio/GenericFunctions.ts

@@ -17,11 +17,8 @@ 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;