Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

fix: broken lockfile

sriramveeraghanta54b80e91eb60
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d19e117da7..41f77995ae 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -99,7 +99,6 @@ overrides:
prosemirror-view: 1.40.0
'@types/express': 4.17.23
typescript: 5.8.3
-<<<<<<< HEAD
vite: 7.3.1
qs: 6.14.2
diff: 5.2.2
@@ -116,9 +115,6 @@ overrides:
ajv@8: 8.18.0
undici@7: 7.24.0
flatted: 3.4.2
-=======
- vite: 7.1.11
->>>>>>> 7902805635a88ef07e5df02c17bef61211947d8c
importers:
@@ -661,12 +657,6 @@ importers:
next-themes:
specifier: 0.4.6
-<<<<<<< HEAD
-=======
- posthog-js:
- specifier: ^1.255.1
- version: 1.255.1
->>>>>>> 7902805635a88ef07e5df02c17bef61211947d8c
react:
specifier: 'catalog:'
version: 18.3.1
@@ -6174,10 +6164,6 @@ packages:
resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
engines: {node: '>= 10.13.0'}
- resolution: {integrity: sha512-twQoecYPiVA5K/h6SxtORw/Bs3ar+mLUtoPSc7iMXzQzK8d7eJ/R09wmTwAjiamETn1cXYPGfNnu7DMoHgu12w==}
- hasBin: true
-
resolution: {integrity: sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==}
hasBin: true
@@ -7928,18 +7914,6 @@ packages:
prettier:
optional: true
-<<<<<<< HEAD
-=======
- resolution: {integrity: sha512-4+U7gF9hMpGilQmdVJwQaVZZEkD7XwC4ZDmBa51mobaPYelELEMoMfNM2hLyvB2x12gk1IJui1DnwOE4t+MXhw==}
- hasBin: true
- peerDependencies:
- prettier: ^2 || ^3
- peerDependenciesMeta:
- prettier:
- optional: true
-
->>>>>>> 7902805635a88ef07e5df02c17bef61211947d8c
resolution: {integrity: sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==}
engines: {node: '>=0.6.19'}
@@ -8011,14 +7985,6 @@ packages:
resolution: {integrity: sha512-HYNoHZa2GorYNyqiCaBgsxvcJIn7OHq6inEga+E6Ke3m5JkoqpQbnFssk4jwe+K7AhGa2fcha4wSOf1Kn01dMg==}
-<<<<<<< HEAD
-=======
- resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==}
- engines: {node: '>=16 || 14 >=14.17'}
- hasBin: true
-
->>>>>>> 7902805635a88ef07e5df02c17bef61211947d8c
resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
engines: {node: '>=4'}
@@ -8921,7 +8887,7 @@ snapshots:
dependencies:
'@babel/compat-data': 7.28.4
'@babel/helper-validator-option': 7.27.1
- browserslist: 4.26.2
+ browserslist: 4.28.1
lru-cache: 5.1.1
semver: 6.3.1
@@ -13705,8 +13671,6 @@ snapshots:
merge-stream: 2.0.0
supports-color: 8.1.1
-
@@ -16013,19 +15977,6 @@ snapshots:
dependencies:
inline-style-parser: 0.1.1
-<<<<<<< HEAD
-=======
- dependencies:
- '@jridgewell/gen-mapping': 0.3.13
- commander: 4.1.1
- glob: 11.1.0
- lines-and-columns: 1.2.4
- mz: 2.7.0
- pirates: 4.0.7
- ts-interface-checker: 0.1.13
-
->>>>>>> 7902805635a88ef07e5df02c17bef61211947d8c
dependencies:
has-flag: 3.0.0
@@ -16270,7 +16221,7 @@ snapshots:
dependencies:
'@quansync/fs': 0.1.5
defu: 6.1.4
- jiti: 2.5.1
+ jiti: 2.6.1
quansync: 0.2.11