[Koha-bugs] [Bug 6190] Custom field removal from patron entry screens

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

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

--- Comment #27 from Nicole C. Engard <nengard at gmail.com> 2011-08-25 01:11:56 UTC ---
Tested applying with using git bz and it still doesn't apply:


--------------------------
Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: bug_6190: BorrowerUnwantedField syspref and removing fields from the
patron entry
Using index info to reconstruct a base tree...
<stdin>:348: trailing whitespace.
[% END # hide fieldset %]    
<stdin>:522: trailing whitespace.
[%END # hide fieldset %]  
<stdin>:841: trailing whitespace.
        $template->param( "no$_" => 1);    
warning: 3 lines add whitespace errors.
Falling back to patching base and 3-way merge...
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/members/memberentrygen.tt
Auto-merging members/memberentry.pl
Failed to merge in the changes.
Patch failed at 0001 bug_6190: BorrowerUnwantedField syspref and removing
fields from the patron entry
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
nengard at debian:~/kohaclone$

-- 
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.