http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13887
Nicole C. Engard <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #5 from Nicole C. Engard <[email protected]> --- Sorry, this one doesn't apply. 16:25 ~/kohaclone (master % u=)$ git qa 13887 >From git://git.koha-community.org/koha * branch master -> FETCH_HEAD Branch bug13887-qa set up to track remote branch master from origin. Switched to a new branch 'bug13887-qa' Bug 13887 - Add datatables to item specific holds table 37385 - Bug 13887 - Add datatables to item specific holds table Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 13887 - Add datatables to item specific holds table Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt Failed to merge in the changes. Patch failed at 0001 Bug 13887 - Add datatables to item specific holds table 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-13887---Add-datatables-to-item-specific-holds--D8nqyD.patch 16:25 ~/kohaclone (bug13887-qa *+%|AM u=)$ -- 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/
