Address conflicts

minio · Mar 22, 2021 · b31daa2 · b31daa2
1 parent 27cc5fa
commit b31daa2
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/src/test/functional/functional-tests.js b/src/test/functional/functional-tests.js
@@ -61,19 +61,7 @@ describe('functional tests', function() {
   } else {
     playConfig.useSSL = true
   }
-<<<<<<< HEAD
-
-  playConfig={
-    useSSL:false,
-    endPoint:"localhost",
-    port:9000,
-    accessKey:"minio",
-    secretKey:"minio123"
-  }
 
-=======
-
->>>>>>> 65ccd71... Revert local functional test config
   // dataDir is falsy if we need to generate data on the fly. Otherwise, it will be
   // a directory with files to read from, i.e. /mint/data.
   var dataDir = process.env['MINT_DATA_DIR']