fix conflict

vy-qle · Sep 4, 2019 · 2e4cc19 · 2e4cc19
2 parents 7420720 + a7d0956
commit 2e4cc19
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
         - We definition these function re-use many times. Example: Login,Shop,Checkout...
         - Syntax of Custom keyword :
            @Keyword
-           def static {return type} {functinname}(parameters,parameters...){
+           def static {return type} {functionname}(parameters,parameters...){
               ...
            }
       + Data-driven

diff --git a/Test Suites/Run Test Suites in parallel.ts → Test Suites/Run All Test Suites.ts b/Test Suites/Run Test Suites in parallel.ts → Test Suites/Run All Test Suites.ts
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestSuiteCollectionEntity>
    <description></description>
-   <name>Run Test Suites in parallel</name>
+   <name>Run All Test Suites</name>
    <tag></tag>
-   <executionMode>PARALLEL</executionMode>
+   <executionMode>SEQUENTIAL</executionMode>
    <maxConcurrentInstances>3</maxConcurrentInstances>
    <testSuiteRunConfigurations>
       <TestSuiteRunConfiguration>

diff --git a/settings/internal/com.kms.katalon.composer.testcase.properties b/settings/internal/com.kms.katalon.composer.testcase.properties
@@ -1,2 +1 @@
-#Wed Sep 04 16:21:30 ICT 2019
 testCaseTag=""