[Koha-bugs] [Bug 11904] Proposal for a uniform way to send messages to user interface

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11904

M. de Rooy <m.de.rooy at rijksmuseum.nl> changed:

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

--- Comment #22 from M. de Rooy <m.de.rooy at rijksmuseum.nl> ---
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/less/opac.less
Auto-merging koha-tmpl/opac-tmpl/bootstrap/css/opac.css
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/css/opac.css
Auto-merging koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css


Besides that this patch does not apply, could you, Julian, further explain the
reason why these patches touch the css and less files? Is the third example
patch meant for a push to mainstream, or just as a test file?

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