[Koha-bugs] [Bug 9303] relative's checkouts in the opac

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9303

--- Comment #130 from Heather Braum <hbraum at nekls.org> ---
Kyle, I went to sign off on this patch again using the sandboxes, and got this
error that the sandbox wasn't ready:  

Some problems occurred applying patches from bug 9303:
<h1>Something went wrong !</h1>Applying: Bug 9303 [1] - relative's checkouts in
the opac - Schema Updates
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging Koha/Schema/Result/Borrower.pm
CONFLICT (content): Merge conflict in Koha/Schema/Result/Borrower.pm
Auto-merging Koha/Schema/Result/Issue.pm
CONFLICT (content): Merge conflict in Koha/Schema/Result/Issue.pm
Auto-merging Koha/Schema/Result/OldIssue.pm
CONFLICT (content): Merge conflict in Koha/Schema/Result/OldIssue.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 9303 [1] - relative's checkouts in the opac - Schema
Updates
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.
Bug 9303 - relative's checkouts in the opac

28153 - Bug 9303 [1] - relative's checkouts in the opac - Schema Updates
28154 - Bug 9303 [2] - relative's checkouts in the opac - Database Updates
28155 - Bug 9303 [3] - relative's checkouts in the opac
29215 - Bug 9303 [4] [QA Followup]
29302 - Bug 9303 [5] [QA Followup 2]
29303 - Bug 9303 [6] [QA Followup 3] - Rename prefs and field
29304 - Bug 9303 [7] [QA Followup 4] - Undo changes to prog and ccsr themes

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