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 998 forks source link

vendor/assets/stylesheets/twitter-bootstrap-static/bootstrap.css.erb has merge-conflict resolution strings #844

Open cmouse opened 9 years ago

cmouse commented 9 years ago

In line 1

<<<<<<< HEAD

In line 5785

=======

In line 6686

>>>>>>> c457371fe4c06bd284a97d737a4d50bbcd266a2a
panmari commented 9 years ago

I think this one was solved, there's not even a line 5785 on master: https://github.com/seyhunak/twitter-bootstrap-rails/blob/master/app/assets/stylesheets/twitter-bootstrap-static/bootstrap.css.erb