[Koha-bugs] [Bug 20217] Make header's catalog search menu into a split button

bugzilla-daemon at bugs.koha-community.org bugzilla-daemon at bugs.koha-community.org
Mon Apr 23 23:55:21 CEST 2018


Séverine Queune <severine.queune at bulac.fr> changed:

           What    |Removed                     |Added
                 CC|                            |severine.queune at bulac.fr
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #6 from Séverine Queune <severine.queune at bulac.fr> ---
Can't apply the dependency :

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 19474: Convert staff client CSS to SCSS
Applying: Bug 19474: (QA follow-up) Fix sass lint yaml configuration
Applying: Bug 19474: (follow-up) Bring scss up to date with latest CSS changes
Applying: Bug 19474: (follow-up) Compiled CSS
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/css/staff-global.css
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/css/staff-global.css
CONFLICT (content): Merge conflict in
Failed to merge in the changes.
Patch failed at 0001 Bug 19474: (follow-up) Compiled CSS
The copy of the patch that failed is found in:

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

More information about the Koha-bugs mailing list