From 9a22e31b5881ed940ac522b19544d8a1f47213b6 Mon Sep 17 00:00:00 2001 From: Surya Tripathi Date: Fri, 15 May 2020 19:53:59 +0530 Subject: [PATCH] resolving merge conflict --- bin/commands/runs.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/bin/commands/runs.js b/bin/commands/runs.js index 03d9fc85..4b1a90ce 100644 --- a/bin/commands/runs.js +++ b/bin/commands/runs.js @@ -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"), @@ -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);