[Koha-bugs] [Bug 7001] User Configurable Slips

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

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

--- Comment #47 from Liz Rea <wizzyrea at gmail.com> 2012-01-20 22:57:29 UTC ---
urg, and the changes I fetched today, this patch will not apply on. argle
bargle bargle.

Aside: you must be the most patient person alive. Thanks for that.


liz at koha-deb:~/kohaclone$ git am -3 /tmp/patch-ikn6Jg.patch
Applying: bug_7001: Issue and Reserve slips are notices.
/home/liz/kohaclone/.git/rebase-apply/patch:705: trailing whitespace.

/home/liz/kohaclone/.git/rebase-apply/patch:1068: trailing whitespace.
ITEM RESERVED: 
/home/liz/kohaclone/.git/rebase-apply/patch:2181: trailing whitespace.
    [% UNLESS independant_branch %]        
/home/liz/kohaclone/.git/rebase-apply/patch:2191: trailing whitespace.
    [% END %]        
/home/liz/kohaclone/.git/rebase-apply/patch:2241: trailing whitespace.
        [% END %]        
warning: squelched 2 whitespace errors
warning: 7 lines add whitespace errors.
Using index info to reconstruct a base tree...
<stdin>:705: trailing whitespace.

<stdin>:1068: trailing whitespace.
ITEM RESERVED: 
<stdin>:2181: trailing whitespace.
    [% UNLESS independant_branch %]        
<stdin>:2191: trailing whitespace.
    [% END %]        
<stdin>:2241: trailing whitespace.
        [% END %]        
warning: squelched 4 whitespace errors
warning: 7 lines applied after fixing whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging C4/Circulation.pm
Auto-merging C4/Letters.pm
CONFLICT (content): Merge conflict in C4/Letters.pm
Auto-merging installer/data/mysql/de-DE/mandatory/sample_notices.sql
Auto-merging installer/data/mysql/en/mandatory/sample_notices.sql
Auto-merging installer/data/mysql/es-ES/mandatory/sample_notices.sql
Auto-merging installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
Auto-merging installer/data/mysql/it-IT/necessari/notices.sql
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
Auto-merging installer/data/mysql/pl-PL/mandatory/sample_notices.sql
Auto-merging installer/data/mysql/ru-RU/mandatory/sample_notices.sql
Auto-merging installer/data/mysql/uk-UA/mandatory/sample_notices.sql
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
Removing koha-tmpl/intranet-tmpl/prog/en/modules/circ/hold-transfer-slip.tt
Removing koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
Auto-merging tools/letter.pl
Failed to merge in the changes.
Patch failed at 0001 bug_7001: Issue and Reserve slips are notices.
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".

-- 
Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA Contact for the bug.
You are watching all bug changes.