search

seyhunak / twitter-bootstrap-rails

Twitter Bootstrap for Rails 6.0, Rails 5 - Rails 4.x Asset Pipeline
https://github.com/seyhunak/twitter-bootstrap-rails
4.5k stars 996 forks source link

Removed remains of some merge conflict #779

Closed panmari closed 10 years ago

panmari commented 10 years ago

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