mirror of
https://github.com/stablyai/orca.git
synced 2026-09-27 08:02:35 +00:00
Only conflict was pnpm-workspace.yaml: both sides appended to minimumReleaseAgeExclude. Kept both entries -- ours for @pierre/diffs@1.4.1 and main's for electron@43.7.0 -- and our patchedDependencies line is untouched.