https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24786
Katrin Fischer <katrin.fisc...@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #35 from Katrin Fischer <katrin.fisc...@bsz-bw.de> --- Requires a rebase: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 24786: Allow setting a register for the session Applying: Bug 24786: Allow selection of cash register at login Applying: Bug 24786: Update point of sale to use session register Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 24786: Update point of sale to use session register 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-24786-Update-point-of-sale-to-use-session-regi-_fOoYW.patch -- 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/