Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resolving merge conflict #20

Merged
merged 1 commit into from
May 15, 2020
Merged

resolving merge conflict #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions bin/commands/runs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,4 @@
'use strict';
<<<<<<< HEAD
var archiver = require("../helpers/archiver");
var zipUploader = require("../helpers/zipUpload");
var build = require("../helpers/build");
var logger = require("../helpers/logger");
var config = require('../helpers/config');
var capabilityHelper = require("../helpers/capabilityHelper");
var fs = require('fs');
const Constants = require('../helpers/constants');
const fileHelpers = require('../helpers/fileHelpers');
=======
const fs = require('fs');

const archiver = require("../helpers/archiver"),
Expand All @@ -20,7 +9,6 @@ const archiver = require("../helpers/archiver"),
capabilityHelper = require("../helpers/capabilityHelper"),
Constants = require("../helpers/constants"),
util = require("../helpers/util");
>>>>>>> 11a63ce498033cc6a3814730eb9300f28f8c007a

module.exports = function run(args) {
return runCypress(args);
Expand Down