fix(n8n): resolve committed merge conflict markers

Keep the 2.44.5 side (HEAD) in the overlay and its test; the 2.43.5
side was superseded by the 2.44.5 update.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
Sascha KönigandClaude Fable 5.1 committed 2026-10-26 07:41:33 +01:00
1 parent 239450162e
commit ed2b9fb089
2 files changed
-28

No files matched your search

-10
View File
@@ -15,19 +15,9 @@
modifiedPkgs = mkPkgs [self.overlays.modifications];
defaultPkgs = mkPkgs [self.overlays.default];
<<<<<<< HEAD
expectedVersion = "2.44.5";
expectedSrcHash = "sha256-FqqaYEhkybiYmJf3pYSO3stDn3Dn7iMNZKRgWz08Tng=";
expectedPnpmHash = "sha256-vOJ+8OLpUtWvfy9QmR1X4dwOTY/GCpmM/M5HeB47BV0=";
||||||| 3dbd163
expectedVersion = "2.42.6";
expectedSrcHash = "sha256-bYf0Dgh213RInRNUzZ64YtZFelANhdutgGGWBphjhOU=";
expectedPnpmHash = "sha256-Dc0+xbNbgiZWnDefLpRdLag8ncBkjNXpZVrlz42jG+k=";
=======
expectedVersion = "2.43.5";
expectedSrcHash = "sha256-N8QaNX6tzYPTvJ/H0ROoIdrQ7BWuyMm0VnQHsK4wnng=";
expectedPnpmHash = "sha256-ZQY9wZ7j0RNvsIqIuklvieIuQRsM0oQ2Kr3Wkyq4ywc=";
>>>>>>> cbd7d982ef6f8f71bf6b8ac95d216bdf2a7a8edb
expectedChangelog = "https://github.com/n8n-io/n8n/releases/tag/n8n@${expectedVersion}";
expectedRootNodeModuleSymlinks = [
"ln -s .pnpm/node_modules/sass-embedded node_modules/sass-embedded"