Attempt to fix pnpm-lock merge conflict

This commit is contained in:
Dark_Phoenix_ committed 2025-05-18 22:15:23 +02:00
1 parent c016ed8ba9
commit 6ef5e596e7
1 file changed
+3 -10
+3 -10
View File
@@ -6853,9 +6853,6 @@ packages:
is-core-module@2.13.0:
resolution: {integrity: sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==}
is-core-module@2.13.1:
resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==}
is-core-module@2.16.1:
resolution: {integrity: sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==}
engines: {node: '>= 0.4'}
@@ -12219,7 +12216,7 @@ snapshots:
'@eslint/eslintrc@2.1.2':
dependencies:
ajv: 6.12.6
debug: 4.3.4
debug: 4.4.0
espree: 9.6.1
globals: 13.20.0
ignore: 5.2.4
@@ -12286,7 +12283,7 @@ snapshots:
'@humanwhocodes/config-array@0.11.10':
dependencies:
'@humanwhocodes/object-schema': 1.2.1
debug: 4.3.4
debug: 4.4.0
minimatch: 3.1.2
transitivePeerDependencies:
- supports-color
@@ -17714,10 +17711,6 @@ snapshots:
dependencies:
has: 1.0.3
is-core-module@2.13.1:
dependencies:
hasown: 2.0.2
is-core-module@2.16.1:
dependencies:
hasown: 2.0.2
@@ -19886,7 +19879,7 @@ snapshots:
resolve@1.22.2:
dependencies:
is-core-module: 2.13.1
is-core-module: 2.16.1
path-parse: 1.0.7
supports-preserve-symlinks-flag: 1.0.0