|
24 | 24 | }, |
25 | 25 | "dependencies": { |
26 | 26 | "@codeeditorland/output": "0.0.1", |
| 27 | +<<<<<<< HEAD |
27 | 28 | "@effect/platform": "0.88.1", |
28 | 29 | "@tauri-apps/api": "2.6.0", |
| 30 | +======= |
| 31 | + "@effect/platform": "0.88.2", |
| 32 | + "@tauri-apps/api": "2.7.0", |
| 33 | +>>>>>>> 77a71c3e42532d98de9d3a851e37bc1f4e9ad341 |
29 | 34 | "@tauri-apps/plugin-dialog": "2.3.0", |
30 | 35 | "effect": "3.16.16" |
31 | 36 | }, |
32 | 37 | "devDependencies": { |
33 | 38 | "@effect/experimental": "0.52.2", |
| 39 | +<<<<<<< HEAD |
34 | 40 | "@effect/language-service": "0.27.1", |
| 41 | +======= |
| 42 | + "@effect/language-service": "0.27.2", |
| 43 | +>>>>>>> 77a71c3e42532d98de9d3a851e37bc1f4e9ad341 |
35 | 44 | "@effect/opentelemetry": "0.54.1", |
36 | 45 | "@opentelemetry/exporter-trace-otlp-http": "0.203.0", |
37 | 46 | "@opentelemetry/sdk-logs": "0.203.0", |
38 | 47 | "@opentelemetry/sdk-metrics": "2.0.1", |
39 | 48 | "@opentelemetry/sdk-trace-base": "2.0.1", |
40 | 49 | "@opentelemetry/sdk-trace-web": "2.0.1", |
41 | 50 | "@playform/build": "0.2.5", |
| 51 | +<<<<<<< HEAD |
42 | 52 | "@types/node": "24.0.14", |
| 53 | +======= |
| 54 | + "@types/node": "24.0.15", |
| 55 | +>>>>>>> 77a71c3e42532d98de9d3a851e37bc1f4e9ad341 |
43 | 56 | "cross-env": "7.0.3", |
44 | 57 | "deepmerge-ts": "7.1.5", |
45 | 58 | "ts-patch": "3.3.0", |
|
0 commit comments