File tree Expand file tree Collapse file tree 1 file changed +0
-12
lines changed Expand file tree Collapse file tree 1 file changed +0
-12
lines changed Original file line number Diff line number Diff line change 1
1
'use strict';
2
- <<<<<<< HEAD
3
- var archiver = require("../helpers/archiver");
4
- var zipUploader = require("../helpers/zipUpload");
5
- var build = require("../helpers/build");
6
- var logger = require("../helpers/logger");
7
- var config = require('../helpers/config');
8
- var capabilityHelper = require("../helpers/capabilityHelper");
9
- var fs = require('fs');
10
- const Constants = require('../helpers/constants');
11
- const fileHelpers = require('../helpers/fileHelpers');
12
- =======
13
2
const fs = require('fs');
14
3
15
4
const archiver = require("../helpers/archiver"),
@@ -20,7 +9,6 @@ const archiver = require("../helpers/archiver"),
20
9
capabilityHelper = require("../helpers/capabilityHelper"),
21
10
Constants = require("../helpers/constants"),
22
11
util = require("../helpers/util");
23
- >>>>>>> 11a63ce498033cc6a3814730eb9300f28f8c007a
24
12
25
13
module.exports = function run(args) {
26
14
return runCypress(args);
You can’t perform that action at this time.
0 commit comments