Advertisement
indradg

Untitled

Aug 27th, 2014
337
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.27 KB | None | 0 0
  1. The sandbox you've requested is not ready.
  2. Some problems occurred applying patches from bug 12539:
  3. <h1>Something went wrong !</h1>Applying: Bug 12539: PROG/CCSR deprecation: Remove hardcoded theme from C4/Templates.pm
  4. Using index info to reconstruct a base tree...
  5. Falling back to patching base and 3-way merge...
  6. Auto-merging C4/Templates.pm
  7. Auto-merging installer/data/mysql/sysprefs.sql
  8. Auto-merging installer/data/mysql/updatedatabase.pl
  9. CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
  10. Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
  11. Failed to merge in the changes.
  12. Patch failed at 0001 Bug 12539: PROG/CCSR deprecation: Remove hardcoded theme from C4/Templates.pm
  13. When you have resolved this problem run git bz apply --continue.
  14. If you would prefer to skip this patch, instead run git bz apply --skip.
  15. To restore the original branch and stop patching run git bz apply --abort.
  16. Bug 12539 - PROG/CCSR deprecation: Remove hardcoded theme from C4/Templates.pm
  17.  
  18. 30481 - Bug 12539: PROG/CCSR deprecation: Remove hardcoded theme from C4/Templates.pm
  19. 30516 - Bug 12539: Follow up to fix fallback theme
  20.  
  21. 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