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

-18
View File
@@ -21,25 +21,13 @@
'';
in
prev.n8n.overrideAttrs (finalAttrs: previousAttrs: {
<<<<<<< HEAD
version = "2.44.5";
||||||| 3dbd163
version = "2.42.6";
=======
version = "2.43.5";
>>>>>>> cbd7d982ef6f8f71bf6b8ac95d216bdf2a7a8edb
src = prev.fetchFromGitHub {
owner = "n8n-io";
repo = "n8n";
tag = "n8n@${finalAttrs.version}";
<<<<<<< HEAD
hash = "sha256-FqqaYEhkybiYmJf3pYSO3stDn3Dn7iMNZKRgWz08Tng=";
||||||| 3dbd163
hash = "sha256-bYf0Dgh213RInRNUzZ64YtZFelANhdutgGGWBphjhOU=";
=======
hash = "sha256-N8QaNX6tzYPTvJ/H0ROoIdrQ7BWuyMm0VnQHsK4wnng=";
>>>>>>> cbd7d982ef6f8f71bf6b8ac95d216bdf2a7a8edb
};
pnpmDeps = prev.fetchPnpmDeps {
@@ -47,13 +35,7 @@ in
pnpm = prev.pnpm_11;
fetcherVersion = 4;
postPatch = relaxPnpmEngine;
<<<<<<< HEAD
hash = "sha256-vOJ+8OLpUtWvfy9QmR1X4dwOTY/GCpmM/M5HeB47BV0=";
||||||| 3dbd163
hash = "sha256-Dc0+xbNbgiZWnDefLpRdLag8ncBkjNXpZVrlz42jG+k=";
=======
hash = "sha256-ZQY9wZ7j0RNvsIqIuklvieIuQRsM0oQ2Kr3Wkyq4ywc=";
>>>>>>> cbd7d982ef6f8f71bf6b8ac95d216bdf2a7a8edb
};
postPatch = (previousAttrs.postPatch or "") + relaxPnpmEngine;