https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20218 Maksim Sen <maksim.sen@inlibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |maksim.sen@inlibro.com --- Comment #2 from Maksim Sen <maksim.sen@inlibro.com> --- Hey Nick, I tried applying the patch (I'm currently on the master branch), but I got this error, Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 20218: Fix matching of uri in tracklinks Using index info to reconstruct a base tree... M opac/tracklinks.pl Falling back to patching base and 3-way merge... Auto-merging opac/tracklinks.pl CONFLICT (content): Merge conflict in opac/tracklinks.pl error: Failed to merge in the changes. Patch failed at 0001 Bug 20218: Fix matching of uri in tracklinks The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-20218-Fix-matching-of-uri-in-tracklinks-KoSJEI.patch Is there an extra step needed to apply this patch? -- You are receiving this mail because: You are watching all bug changes.