twitter-bootstrap-rails icon indicating copy to clipboard operation
twitter-bootstrap-rails copied to clipboard

Published 20 hours ago • verified publisher icon seyhunak

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

Open cmouse opened this issue 9 years ago • 1 comments

In line 1

<<<<<<< HEAD

In line 5785

=======

In line 6686

>>>>>>> c457371fe4c06bd284a97d737a4d50bbcd266a2a

cmouse avatar Feb 22 '15 18:02 cmouse

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

panmari avatar Aug 07 '15 13:08 panmari