joomla/joomla-platform — Issue #457: Unresolved conflict commited
Author: jonnsl
Created: 2011-10-22 18:00:23+00:00
State: open

I think that someone forgot to resolve a conflict before commit
https://github.com/joomla/joomla-platform/blob/staging/libraries/joomla/html/toolbar/button.php#L41