fix: fix conflict texts

VisActor · Dec 30, 2024 · 3d880df · 3d880df
1 parent 8f67825
commit 3d880df
Showing 1 changed file with 0 additions and 33 deletions.
diff --git a/packages/vmind/jest.config.js b/packages/vmind/jest.config.js
@@ -2,41 +2,8 @@ const path = require('path');
 const baseJestConfig = require('@internal/jest-config/jest.base');
 
 module.exports = {
-<<<<<<< Updated upstream
-  preset: 'ts-jest',
-  runner: 'jest-electron/runner',
-  testEnvironment: 'jest-electron/environment',
-  testMatch: ['<rootDir>/__tests__/unit/*.test.(js|ts)'],
-  silent: true,
-  globals: {
-    'ts-jest': {
-      isolatedModules: true,
-      resolveJsonModule: true,
-      esModuleInterop: true,
-      experimentalDecorators: true,
-      module: 'ESNext',
-      tsconfig: './tsconfig.test.json'
-    }
-  },
-  verbose: true,
-  collectCoverage: true,
-  coverageReporters: ['json-summary', 'lcov', 'text'],
-  coveragePathIgnorePatterns: ['node_modules', '__tests__', 'interface.ts', '.d.ts', 'typings', 'vite'],
-  collectCoverageFrom: [
-    '**/src/**',
-    '!**/cjs/**',
-    '!**/build/**',
-    '!**/esm/**',
-    '!**/node_modules/**',
-    '!**/__tests__/**',
-    '!**/types/**',
-    '!**/interface.ts',
-    '!**/vite/**'
-  ]
-=======
   ...baseJestConfig,
   moduleNameMapper: {
     ...baseJestConfig.moduleNameMapper
   }
->>>>>>> Stashed changes
 };