From a07e3f4e41b2846291198b7e7dc23a0acfb639de Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Fri, 15 Oct 2021 10:20:16 -0700 Subject: [PATCH] Forgot to commit change --- ui/desktop/tests/end2end/test-helpers.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ui/desktop/tests/end2end/test-helpers.js b/ui/desktop/tests/end2end/test-helpers.js index e99b95dc7..80282aaf6 100644 --- a/ui/desktop/tests/end2end/test-helpers.js +++ b/ui/desktop/tests/end2end/test-helpers.js @@ -9,11 +9,7 @@ const path = require('path'); */ exports.generateScreenshotPath = (screenshotTestDirectory, fileName) => { const screenshotFormat = '.png'; -<<<<<<< HEAD const screenshotsRootPath = path.join(__dirname, 'screenshots'); -======= - const screenshotsRootPath = path.join(__dirname, '/screenshots/'); ->>>>>>> 8c489b81 (refactor: 💡 Create generateScreenshotPath as test helper) const screenshotPath = path.join( screenshotsRootPath, screenshotTestDirectory