From aff7cdb762bf9e51d2f97ad96e94cf6aae13bda3 Mon Sep 17 00:00:00 2001
From: Anup Nehe <anup.nehe@technoforte.co.in>
Date: Wed, 23 Oct 2024 17:16:56 +0530
Subject: [PATCH] resolve conflicts

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>
---
 api-test/testNgXmlFiles/pmsApi.xml | 40 +++++++++++++++---------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/api-test/testNgXmlFiles/pmsApi.xml b/api-test/testNgXmlFiles/pmsApi.xml
index 0d2a69c68c..d2434b3bc4 100644
--- a/api-test/testNgXmlFiles/pmsApi.xml
+++ b/api-test/testNgXmlFiles/pmsApi.xml
@@ -340,7 +340,7 @@
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
 	</test>
-			<test name="GetConfiguration">
+	<test name="GetConfiguration">
 		<parameter name="ymlFile"
 			value="pms/GetConfiguration/GetConfiguration.yml" />
 		<classes>
@@ -348,7 +348,7 @@
 		</classes>
 	</test>
 
-		<test name="saveUserConsent">
+	<test name="saveUserConsent">
 		<parameter name="ymlFile"
 			value="pms/SaveUserConsent/SaveUserConsent.yml" />
 		<classes>
@@ -356,7 +356,7 @@
 				name="io.mosip.testrig.apirig.testscripts.SimplePostWithoutBody" />
 		</classes>
 	</test>
-	
+
 	<test name="GetUserConsent">
 		<parameter name="ymlFile"
 			value="pms/GetUserConsent/GetUserConsent.yml" />
@@ -367,16 +367,16 @@
 	<test name="GetOriginalPartnerCertificates">
 		<parameter name="ymlFile"
 			value="pms/GetOriginalPartnerCertificates/GetOriginalPartnerCertificates.yml"
-	/>
+		/>
 		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
 	</test>
-	
-		<test name="GetAllApprovedDeviceProviderIds">
+
+	<test name="GetAllApprovedDeviceProviderIds">
 		<parameter name="ymlFile"
 			value="pms/GetAllApprovedDeviceProviderIds/GetAllApprovedDeviceProviderIds.yml"
-	/>
+		/>
 		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
@@ -447,7 +447,7 @@
 				name="io.mosip.testrig.apirig.testscripts.SimplePost" />
 		</classes>
 	</test>
-		<test name="RejectMappingDeviceToSbi">
+	<test name="RejectMappingDeviceToSbi">
 		<parameter name="ymlFile"
 			value="pms/RejectMappingDeviceToSbi/RejectMappingDeviceToSbi.yml" />
 		<classes>
@@ -478,15 +478,15 @@
 				name="io.mosip.testrig.apirig.testscripts.SimplePost" />
 		</classes>
 	</test>
-		<test name="GetAllApprovedFtmProvider">
+	<test name="GetAllApprovedFtmProvider">
 		<parameter name="ymlFile"
 			value="pms/GetAllApprovedFtmProvider/GetAllApprovedFtmProvider.yml"
-	/>
+		/>
 		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
 	</test>
-		<test name="CreateFtmChipDetails">
+	<test name="CreateFtmChipDetails">
 		<parameter name="ymlFile"
 			value="pms/CreateFtmChipDetails/CreateFtmChipDetails.yml" />
 		<parameter name="idKeyName" value="id" />
@@ -495,7 +495,7 @@
 				name="io.mosip.testrig.apirig.testscripts.SimplePostForAutoGenId" />
 		</classes>
 	</test>
-			<test name="UploadCertificateOfFtpChip">
+	<test name="UploadCertificateOfFtpChip">
 		<parameter name="ymlFile"
 			value="pms/UploadCertificateOfFtpChip/UploadCertificateOfFtpChip.yml" />
 		<classes>
@@ -503,28 +503,28 @@
 				name="io.mosip.testrig.apirig.testscripts.SimplePost" />
 		</classes>
 	</test>
-		<test name="ApproveFTMChipDetail">
+	<test name="ApproveFTMChipDetail">
 		<parameter name="ymlFile"
 			value="pms/ApproveFTMChipDetail/ApproveFTMChipDetail.yml" />
 		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.SimplePatch" />
 		</classes>
 	</test>
-		<test name="GetListAllFTMChip">
+	<test name="GetListAllFTMChip">
 		<parameter name="ymlFile"
 			value="pms/GetListAllFTMChip/GetListAllFTMChip.yml" />
 		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
-	</test>	
-			<test name="GetOriginalFtmCertifacte">
+	</test>
+	<test name="GetOriginalFtmCertifacte">
 		<parameter name="ymlFile"
 			value="pms/GetOriginalFtmCertifacte/GetOriginalFtmCertifacte.yml" />
 		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
-	</test>	
-		  <test name="DeactivateFtm">
+	</test>
+	<test name="DeactivateFtm">
 		<parameter name="ymlFile"
 			value="pms/DeactivateFtm/DeactivateFtm.yml" />
 		<classes>
@@ -532,11 +532,11 @@
 				name="io.mosip.testrig.apirig.testscripts.SimplePost" />
 		</classes>
 	</test>
-		<test name="GetOriginalFtmCertifacteAfterDeactiveFtm">
+	<test name="GetOriginalFtmCertifacteAfterDeactiveFtm">
 		<parameter name="ymlFile"
 			value="pms/GetOriginalFtmCertifacteAfterDeactiveFtm/GetOriginalFtmCertifacteAfterDeactiveFtm.yml" />
 		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
-	</test>	
+	</test>
 </suite>
\ No newline at end of file