[Koha-bugs] [Bug 26346] Add option to make a public list editable by library staff only

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

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

shi-yao.wang at inLibro.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |shi-yao.wang at inLibro.com
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #110 from shi-yao.wang at inLibro.com ---
Here is the result after I tried to apply the changes with `git bz apply
26346`:


Bug 26346 - Add option to make a public list editable by library staff only

128383 - Bug 26346: Database changes
128384 - Bug 26346: Updated schema file
128385 - Bug 26346: Add option to make public lists editable by all staff

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 26346: Database changes
Applying: Bug 26346: Updated schema file
Applying: Bug 26346: Add option to make public lists editable by all staff
Using index info to reconstruct a base tree...
M       Koha/Patron.pm
M       koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
M       opac/opac-shelves.pl
M       t/db_dependent/Koha/Patron.t
M       virtualshelves/shelves.pl
Falling back to patching base and 3-way merge...
Auto-merging virtualshelves/shelves.pl
Auto-merging t/db_dependent/Koha/Patron.t
CONFLICT (content): Merge conflict in t/db_dependent/Koha/Patron.t
Auto-merging opac/opac-shelves.pl
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
Auto-merging Koha/Patron.pm
CONFLICT (content): Merge conflict in Koha/Patron.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 26346: Add option to make public lists editable by all
staff
hint: Use 'git am --show-current-patch' 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-26346-Add-option-to-make-public-lists-editable-HTuW5n.patch

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