http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10067
Nicole Engard (ByWater) <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #38 from Nicole Engard (ByWater) <[email protected]> --- 11:02 ~/kohaclone (master % u=)$ git qa 10067 >From git://git.koha-community.org/koha * branch master -> FETCH_HEAD Branch bug10067-qa set up to track remote branch master from origin. Switched to a new branch 'bug10067-qa' Bug 10067 - decreaseLoanHighHolds messes with specify due date 42794 - Bug 10067 - decreaseLoanHighHolds messes with specify due date Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 10067 - decreaseLoanHighHolds messes with specify due date 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/circ/circulation.tt Auto-merging circ/circulation.pl CONFLICT (content): Merge conflict in circ/circulation.pl Failed to merge in the changes. Patch failed at 0001 Bug 10067 - decreaseLoanHighHolds messes with specify due date 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-10067---decreaseLoanHighHolds-messes-with-spec-ly2_w7.patch 11:03 ~/kohaclone (bug10067-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/
