[Koha-bugs] [Bug 7572] Add Clubs & Services Feature

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

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

Liz Rea <wizzyrea at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #14 from Liz Rea <wizzyrea at gmail.com> ---
Falling back to patching base and 3-way merge...
Auto-merging C4/Auth.pm
Auto-merging cataloguing/addbiblio.pl
Auto-merging circ/circulation.pl
Auto-merging installer/data/mysql/kohastructure.sql
CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.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/includes/circ-menu.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt

Most of those are trivial changes.

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