[Koha-bugs] [Bug 12461] Add patron clubs feature

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

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

--- Comment #19 from jdemuth at roseville.ca.us <jdemuth at roseville.ca.us> ---
Hi, 

I tried testing this in two different sandboxes and I get this error.

Some problems occurred applying patches from bug 12461:
<h1>Something went wrong !</h1>Applying: Bug 12461 - Add patron clubs feature
Using index info to reconstruct a base tree...
<stdin>:3143: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging opac/opac-user.pl
Auto-merging members/moremember.pl
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
Auto-merging installer/data/mysql/userpermissions.sql
Auto-merging installer/data/mysql/userflags.sql
Auto-merging installer/data/mysql/kohastructure.sql
CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql
Auto-merging circ/circulation.pl
Auto-merging Koha/Template/Plugin/Koha.pm Auto-merging
Koha/Template/Plugin/Borrowers.pm CONFLICT (content): Merge conflict in
Koha/Template/Plugin/Borrowers.pm Auto-merging Koha/Schema/Result/Borrower.pm
CONFLICT (content): Merge conflict in Koha/Schema/Result/Borrower.pm
Auto-merging C4/Members.pm CONFLICT (content): Merge conflict in C4/Members.pm
Auto-merging C4/Auth.pm Failed to merge in the changes.
Patch failed at 0001 Bug 12461 - Add patron clubs feature

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.
Bug 12461 - Add patron clubs feature

43428 - Bug 12461 - Add patron clubs feature

Apply? [(y)es, (n)o, (i)nteractive] Patch left in
/tmp/Bug-12461---Add-patron-clubs-feature-1dbTgL.patch .

Jen DeMuth

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