[Koha-bugs] [Bug 7673] New patron permissions
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Tue Oct 23 10:38:45 CEST 2012
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7673
Koha Team AMU <koha.aixmarseille at gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
CC| |koha.aixmarseille at gmail.com
--- Comment #12 from Koha Team AMU <koha.aixmarseille at gmail.com> ---
Sandbox setup by koha.aixmarseille at gmail.com with database -1 and bug 7673 on
Tue Oct 23 10:05:40 2012
Something went wrong !
Applying: Bug 7673 : New patron permissions
Using index info to reconstruct a base tree...
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/includes/cat-toolbar.inc
Auto-merging tools/batchMod.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 7673 : New patron permissions
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".
Bug 7673 - New patron permissions
Bug 7673 : New patron permissions
Apply? [yn]
Patch left in /tmp/Bug-7673--New-patron-permissions-dv6m4o.patch
=== translation installation ===
Posté le 2012-01-01 Modifier | Supprimer | Ajouter
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list