[Koha-bugs] [Bug 12446] Enable an adult to have a guarantor

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

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12446

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

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

--- Comment #57 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Sorry, patch no longer applies :(

Bug 12446 - Enable an adult to have a guarantor

64794 - Bug 12446 - Enable an adult to have a guarantor
64828 - Bug 12446 - Added a missing comma in kohastructure.sql

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 12446 - Enable an adult to have a guarantor
Using index info to reconstruct a base tree...
M       installer/data/mysql/kohastructure.sql
M       installer/data/mysql/sysprefs.sql
M       koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
M       koha-tmpl/intranet-tmpl/prog/js/members.js
M       members/memberentry.pl
M       members/moremember.pl
M       svc/members/search
Falling back to patching base and 3-way merge...
Auto-merging svc/members/search
Auto-merging members/moremember.pl
Auto-merging members/memberentry.pl
CONFLICT (content): Merge conflict in members/memberentry.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/js/members.js
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
Auto-merging installer/data/mysql/sysprefs.sql
Auto-merging installer/data/mysql/kohastructure.sql
error: Failed to merge in the changes.
Patch failed at 0001 Bug 12446 - Enable an adult to have a guarantor
The copy of the patch that failed is found in: .git/rebase-apply/patch
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".
Patch left in /tmp/Bug-12446---Enable-an-adult-to-have-a-guarantor-iB_HiD.patch

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