[Koha-bugs] [Bug 8688] Add a recall button to the biblio record details page.

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8688

Nicole C. Engard <nengard at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #17 from Nicole C. Engard <nengard at gmail.com> ---
08:16 ~/kohaclone (master % u=)$ git qa 8688
>From git://git.koha-community.org/koha
 * branch            master     -> FETCH_HEAD
Branch bug8688-qa set up to track remote branch master from origin.
Switched to a new branch 'bug8688-qa'
Bug 8688 - Add a recall button to the biblio record details page.

36741 - Bug 8688 - Add a Recall button to the biblio record details page.

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 8688 - Add a Recall button to the biblio record details page.
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/catalogue/detail.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/sysprefs.sql
Auto-merging installer/data/mysql/en/mandatory/sample_notices.sql
Auto-merging catalogue/detail.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 8688 - Add a Recall button to the biblio record
details page.
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-8688---Add-a-Recall-button-to-the-biblio-recor-Glrmn_.patch
08:21 ~/kohaclone (bug8688-qa *+%|AM u=)$

-- 
You are receiving this mail because:
You are watching all bug changes.