fixed conflicts

2013-06-12 11:01:53 +02:00
parent 54a8d31350 0c67e4e0b8
commit 51e80bbc65
9 changed files with 103 additions and 76 deletions
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'

 ruby '2.0.0'
-gem 'rails', '4.0.0.rc1'
+gem 'rails', '4.0.0.rc2'

 # Servers
 gem 'thin'
@@ -42,7 +42,7 @@ gem 'less-rails'
 gem 'sass-rails', '~> 4.0.0.rc1'
 gem 'therubyracer'
 gem 'turbolinks'
-gem 'twitter-bootstrap-rails', github: 'diowa/twitter-bootstrap-rails', branch: 'fontawesome-3.1.1'
+gem 'twitter-bootstrap-rails'
 gem 'uglifier', '>= 1.3.0'

 group :development, :test do