https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16486
Katrin Fischer <katrin.fisc...@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #38 from Katrin Fischer <katrin.fisc...@bsz-bw.de> --- I am sorry, Aleisha, I know this has been sitting for a bit. Can you please rebase? Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 16486: Display the timestamp for account payments/writeoffs Applying: Bug 16486: [FOLLOW-UP] Putting time in date column Applying: Bug 16486: [FOLLOW-UP] Adding timestamp to date in other places Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt M koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt M members/printfeercpt.pl M members/printinvoice.pl Falling back to patching base and 3-way merge... Auto-merging members/printinvoice.pl CONFLICT (content): Merge conflict in members/printinvoice.pl Auto-merging members/printfeercpt.pl CONFLICT (content): Merge conflict in members/printfeercpt.pl Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 16486: [FOLLOW-UP] Adding timestamp to date in other places 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-16486-FOLLOW-UP-Adding-timestamp-to-date-in-ot-9RSFdA.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/