[Koha-bugs] [Bug 27814] Improve responsive behavior of the user page in the OPAC

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #11 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
A small conflict, but I am not confident in fixing it, can you do it please?

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 27814: Improve responsive behavior of the user page in the OPAC
Using index info to reconstruct a base tree...
M       koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
Auto-merging koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss
error: Failed to merge in the changes.
Patch failed at 0001 Bug 27814: Improve responsive behavior of the user page in
the OPAC
The copy of the patch that failed is found in: .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-27814-Improve-responsive-behavior-of-the-user--KxCJoQ.patch

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