https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21659
Alex Buckley <alexbuck...@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |alexbuck...@catalyst.net.nz --- Comment #2 from Alex Buckley <alexbuck...@catalyst.net.nz> --- Hi Dobrica Thanks for your patch. Can you please rebase your patch against master as it is failing when I try to apply it, as the below output shows: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 21659: Acquisitions Receipt summary Basket group links missing params Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt Failed to merge in the changes. Patch failed at 0001 Bug 21659: Acquisitions Receipt summary Basket group links missing params The copy of the patch that failed is found in: /home/vagrant/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-21659-Acquisitions-Receipt-summary-Basket-grou-KsKk2c.patch -- You are receiving this mail because: You are the assignee for the bug. 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/