http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11559
Magnus Enger <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #11 from Magnus Enger <[email protected]> --- If I apply the patches for bug 10486 and then for this bug I get a conflict: $ git bz apply 10486 Bug 10486 - Allow external Z39.50 targets to be searched from the OPAC 25979 - Bug 10486 - Allow external Z39.50 targets to be searched from the OPAC 26002 - Bug 10486 - QA followup: fix issues with pazpar2 configuration 26017 - Bug 10486 - QA followup: Remove given/when, update license and datatables Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 10486 - Allow external Z39.50 targets to be searched from the OPAC Applying: Bug 10486 - QA followup: fix issues with pazpar2 configuration Applying: Bug 10486 - QA followup: Remove given/when, update license and datatables $ git bz apply 11559 Bug 11559 - Professional cataloger's interface 26069 - Bug 11559 - Supporting changes for Rancor 26070 - Bug 11559 - New libraries for Rancor 26071 - Bug 11559 - Rancor: professional cataloging interface 26104 - Bug 11559 - QA followup: fix translation issues and work around apache config Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 11559 - Supporting changes for Rancor Using index info to reconstruct a base tree... M C4/XSLT.pm M koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css Auto-merging C4/XSLT.pm CONFLICT (content): Merge conflict in C4/XSLT.pm Failed to merge in the changes. Patch failed at 0001 Bug 11559 - Supporting changes for Rancor The copy of the patch that failed is found in: /home/magnus/scripts/kohaclone/.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-11559---Supporting-changes-for-Rancor-CXdWHg.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://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/
