https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=37650

--- Comment #14 from Marcel de Rooy <m.de.r...@rijksmuseum.nl> ---
(In reply to Lisette Scheer from comment #13)
> This needs to be rebased. 
> Applying: Bug 37650: Add lookahead in calling GetOtherReserves in returns.pl
> Using index info to reconstruct a base tree...
> M     C4/Reserves.pm
> M     circ/returns.pl
> Falling back to patching base and 3-way merge...
> Auto-merging circ/returns.pl
> CONFLICT (content): Merge conflict in circ/returns.pl
> Auto-merging C4/Reserves.pm
> CONFLICT (content): Merge conflict in C4/Reserves.pm
> error: Failed to merge in the changes.
> Patch failed at 0001 Bug 37650: Add lookahead in calling GetOtherReserves in
> returns.pl

Thx for trying that one. I will remove the 22.11 variant now.

-- 
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

Reply via email to