[Koha-bugs] [Bug 34631] Independentbranches - Non-superuser should not be able to write Additional contents for other branches

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

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

Myka Kennedy Stephens <mkstephens at fosgail.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |mkstephens at fosgail.org

--- Comment #3 from Myka Kennedy Stephens <mkstephens at fosgail.org> ---
Attempted to test using git bz with Koha Testing Docker. Received following
error:

Applying: Bug 34631: Independentbranches - Non-superuser should not be able to
write Additional contents for other branches
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
M       tools/additional-contents.pl
Falling back to patching base and 3-way merge...
Auto-merging tools/additional-contents.pl
CONFLICT (content): Merge conflict in tools/additional-contents.pl
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
error: Failed to merge in the changes.
Patch failed at 0001 Bug 34631: Independentbranches - Non-superuser should not
be able to write Additional contents for other branches

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