From ea7caa40b9ac3592c7a93279b2b336d0c7a81bf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MALIN=20WID=C3=88N?= Date: Wed, 21 Dec 2022 15:02:05 +0100 Subject: [PATCH] solve merge conflict MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MALIN WIDÈN --- packages/techdocs-cli/cypress.config.js | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/packages/techdocs-cli/cypress.config.js b/packages/techdocs-cli/cypress.config.js index b33ab2eace..abaa324d76 100644 --- a/packages/techdocs-cli/cypress.config.js +++ b/packages/techdocs-cli/cypress.config.js @@ -21,25 +21,9 @@ module.exports = defineConfig({ setupNodeEvents(on, config) { initPlugin(on, config); }, -<<<<<<< HEAD + excludeSpecPattern: ['**/__snapshots__/*', '**/__image_snapshots__/*'], }, - -======= - }, - excludeSpecPattern: ['**/__snapshots__/*', '**/__image_snapshots__/*'], - env: { - mkDocsBaseUrl: 'http://localhost:8000', - backstageBaseUrl: 'http://localhost:3000', - 'cypress-plugin-snapshots': { - autoCleanUp: false, - imageConfig: { - resizeDevicePixelRatio: true, - threshold: 0.01, - }, - }, - }, ->>>>>>> 533a1a2db2 (update to cypress 10) viewportWidth: 1920, viewportHeight: 1080, includeShadowDom: true,