https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=36188
Aleisha Amohia <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Signed Off |Patch doesn't apply --- Comment #26 from Aleisha Amohia <[email protected]> --- kohadev-koha@kohadevbox:koha((b4054dbb157...))$ git bz apply 36188 Bug 36188 - Allow to sort lists by items.dateaccessioned of item records 163100 - Bug 36188: Sort lists by Date acquired (items.dateaccessioned) in the staff client 166472 - Bug 36188: Sort lists by date acquired (items.dateaccessioned) in the OPAC Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 36188: Sort lists by Date acquired (items.dateaccessioned) in the staff client Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt M virtualshelves/shelves.pl Falling back to patching base and 3-way merge... Auto-merging virtualshelves/shelves.pl CONFLICT (content): Merge conflict in virtualshelves/shelves.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 36188: Sort lists by Date acquired (items.dateaccessioned) in the staff client hint: Use 'git am --show-current-patch=diff' to see the failed 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-36188-Sort-lists-by-Date-acquired-itemsdateacc-450ljhgm.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
