seyhunak/twitter-bootstrap-rails — pull request #779 by panmari (2014-08-25 15:04:22+00:00)
Title: Removed remains of some merge conflict

There were some lines lingering from an old merge conflict in the static version of the bootstrap files