[Koha-bugs] [Bug 5010] Incomplete links in carts and lists sent from the staff client

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

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

--- Comment #14 from M. Tompsett <mtompset at hotmail.com> ---
mtompset at ubuntu:~/kohaclone$ git bz apply 5010
Bug 5010 - Incomplete links in carts and lists sent from the staff client

23436 - Bug 5010: Send list emails with complete links back into the catalog
23457 - Bug 5010: Fix incomplete links in carts and lists sent from the staff
client

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 5010: Send list emails with complete links back into the catalog
Applying: Bug 5010: Fix incomplete links in carts and lists sent from the staff
client
/home/mtompset/kohaclone/.git/rebase-apply/patch:58: trailing whitespace.
    $dbh->do(q{INSERT INTO systempreferences ( `variable`, `value`, `options`,
`explanation`, `type` ) VALUES
/home/mtompset/kohaclone/.git/rebase-apply/patch:80: trailing whitespace.
              choices:
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
<stdin>:58: trailing whitespace.
    $dbh->do(q{INSERT INTO systempreferences ( `variable`, `value`, `options`,
`explanation`, `type` ) VALUES
<stdin>:80: trailing whitespace.
              choices:
warning: 2 lines applied after fixing whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
Auto-merging installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/sysprefs.sql
Auto-merging basket/sendbasket.pl

Ugly but it applies. :)

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are watching all bug changes.