solve merge conflict

Signed-off-by: MALIN WIDÈN <malwi130@student.liu.se>
2022-12-21 15:02:05 +01:00
parent fbfda48dff
commit ea7caa40b9
1 changed files with 1 additions and 17 deletions
@@ -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,