Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- The sandbox you've requested is not ready.
- Some problems occurred applying patches from bug 12539:
- <h1>Something went wrong !</h1>Applying: Bug 12539: PROG/CCSR deprecation: Remove hardcoded theme from C4/Templates.pm
- Using index info to reconstruct a base tree...
- Falling back to patching base and 3-way merge...
- Auto-merging C4/Templates.pm
- Auto-merging installer/data/mysql/sysprefs.sql
- 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/modules/admin/preferences/opac.pref
- Failed to merge in the changes.
- Patch failed at 0001 Bug 12539: PROG/CCSR deprecation: Remove hardcoded theme from C4/Templates.pm
- 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 12539 - PROG/CCSR deprecation: Remove hardcoded theme from C4/Templates.pm
- 30481 - Bug 12539: PROG/CCSR deprecation: Remove hardcoded theme from C4/Templates.pm
- 30516 - Bug 12539: Follow up to fix fallback theme
- Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-12539-PROGCCSR-deprecation-Remove-hardcoded-th-7JzQnH.patch .
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement