resolve conflicts

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

injitest/androidSanity.xml

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 <suite name="esignetAndSunbird">
-	<!--<listeners>
-		<listener class-name="inji.utils.SuiteListener" />
-	</listeners>-->
 	<test verbose="2" preserve-order="true" name="android">
 		<classes>
 			<class name="androidTestCases.UnlockWithPasscodeTest">
@@ -31,7 +28,6 @@
 			<class name="androidTestCases.AboutInjiTest">
 				<methods>
 					<include name="verifyAppId"/>
-					<!--<include name="verifyTuvaliVersion"/> Dublicate test  -->
 				</methods>
 			</class>
 		</classes>

injitest/iosConfig.yml

@@ -3,8 +3,8 @@
 # =============================
 # Add your BrowserStack userName and accessKey here or set BROWSERSTACK_USERNAME and
 # BROWSERSTACK_ACCESS_KEY as env variables
-userName: anupnehe_w1PZQx
-accessKey: Zenzg8a3RikxvTUmELFm
+userName: user_Name
+accessKey: secret_Key
 
 # ======================
 # BrowserStack Reporting