[Koha-bugs] [Bug 33363] More specific permissions for purchase suggestions

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

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

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

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Passed QA                   |Patch doesn't apply

--- Comment #11 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
I am sorry, this no longer applies. Can I please get a rebase? It will jump
right up back to the front of the list after.

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 33363: Add separate permissions for creating and deleting
suggestions
Using index info to reconstruct a base tree...
M       installer/data/mysql/mandatory/userpermissions.sql
M       koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
M       koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
M       koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
M       koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
M       members/purchase-suggestions.pl
M       suggestion/suggestion.pl
M       t/Koha/Auth/Permissions.t
Falling back to patching base and 3-way merge...
Auto-merging t/Koha/Auth/Permissions.t
Auto-merging suggestion/suggestion.pl
CONFLICT (content): Merge conflict in suggestion/suggestion.pl
Auto-merging members/purchase-suggestions.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
Auto-merging installer/data/mysql/mandatory/userpermissions.sql
error: Failed to merge in the changes.
Patch failed at 0001 Bug 33363: Add separate permissions for creating and
deleting suggestions
hint: Use 'git am --show-current-patch=diff' to see the failed 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-33363-Add-separate-permissions-for-creating-an-4fjafpom.patch

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