[Koha-bugs] [Bug 18061] Enhance items page (moredetail.pl) with Bootstrap 3 panels

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

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

Sarah Kirby <sarahkirby at catalyst.net.nz> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |sarahkirby at catalyst.net.nz
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #5 from Sarah Kirby <sarahkirby at catalyst.net.nz> ---
Bug 18061 - Enhance items page (moredetail.pl) with Bootstrap 3 panels

60005 - Bug 18061: Restyle catalogue moredetail page

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 18061: Restyle catalogue moredetail page
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/css/staff-global.css
M       koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/css/staff-global.css
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/css/staff-global.css
Failed to merge in the changes.
Patch failed at 0001 Bug 18061: Restyle catalogue moredetail page
The copy of the patch that failed is found in:
   /home/vagrant/kohaclone/.git/rebase-apply/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-18061-Restyle-catalogue-moredetail-page-ctght0.patch

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