[Koha-bugs] [Bug 5431] Separate state field for library addresses

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

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

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

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |nengard at gmail.com
       Patch Status|Needs Signoff               |Does not apply

--- Comment #5 from Nicole C. Engard <nengard at gmail.com> 2011-01-25 01:32:26 UTC ---
Doesn't apply


Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying Bug 5431: Separate state field for library addresses
.dotest/patch:47: trailing whitespace.
            $data->{'branchcity'},       $data->{'branchstate'},       
.dotest/patch:125: trailing whitespace.
                            <br /><!-- TMPL_VAR name="branchcity" escape="HTML"
--><!-- /TMPL_IF --><!-- TMPL_IF name="branchstate" -->, 
error: patch failed: installer/data/mysql/updatedatabase.pl:3937
error: installer/data/mysql/updatedatabase.pl: patch does not apply
error: patch failed: kohaversion.pl:16
error: kohaversion.pl: patch does not apply
Using index info to reconstruct a base tree...
<stdin>:47: trailing whitespace.
            $data->{'branchcity'},       $data->{'branchstate'},       
<stdin>:125: trailing whitespace.
                            <br /><!-- TMPL_VAR name="branchcity" escape="HTML"
--><!-- /TMPL_IF --><!-- TMPL_IF name="branchstate" -->, 
warning: 2 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merged C4/Branch.pm
Auto-merged installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merged kohaversion.pl
CONFLICT (content): Merge conflict in kohaversion.pl
Failed to merge in the changes.
Patch failed at 0001.
When you have resolved this problem run "git-am -i -3 --resolved".
If you would prefer to skip this patch, instead run "git-am -i -3 --skip".
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.