browserstack
diff --git a/‎config/parallel.testng.xml‎
Lines changed: 0 additions & 25 deletions b/‎config/parallel.testng.xml‎
Lines changed: 0 additions & 25 deletions
diff --git a/‎config/sample-local-test.testng.xml‎
Lines changed: 0 additions & 5 deletions b/‎config/sample-local-test.testng.xml‎
Lines changed: 0 additions & 5 deletions
diff --git a/‎config/single.testng.xml‎
Lines changed: 0 additions & 11 deletions b/‎config/single.testng.xml‎
Lines changed: 0 additions & 11 deletions
diff --git a/‎config/suite.testng.xml‎
Lines changed: 0 additions & 36 deletions b/‎config/suite.testng.xml‎
Lines changed: 0 additions & 36 deletions
diff --git a/‎src/test/resources/conf/local.conf.json‎
Lines changed: 0 additions & 20 deletions b/‎src/test/resources/conf/local.conf.json‎
Lines changed: 0 additions & 20 deletions
diff --git a/‎src/test/resources/conf/parallel.conf.json‎
Lines changed: 0 additions & 29 deletions b/‎src/test/resources/conf/parallel.conf.json‎
Lines changed: 0 additions & 29 deletions
diff --git a/‎src/test/resources/conf/single.conf.json‎
Lines changed: 0 additions & 20 deletions b/‎src/test/resources/conf/single.conf.json‎
Lines changed: 0 additions & 20 deletions
diff --git a/‎src/test/resources/conf/suite.conf.json‎
Lines changed: 0 additions & 31 deletions b/‎src/test/resources/conf/suite.conf.json‎
Lines changed: 0 additions & 31 deletions
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 <suite name="Local">
-    <parameter name="config" value="local.conf.json"/>
     <test name="LocalTest">
-<<<<<<< HEAD:config/sample-local-test.testng.xml
-=======
-        <parameter name="environment" value="chrome"/>
->>>>>>> origin:config/local.testng.xml
         <classes>
             <class name="com.browserstack.LocalTest"/>
         </classes>