https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20217
Séverine Queune <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #6 from Séverine Queune <[email protected]> --- 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 koha-tmpl/intranet-tmpl/prog/css/staff-global.css 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: /var/repositories/koha/.git/rebase-apply/patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
