Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updated gemfile

  • Loading branch information...
commit 9e4796e6585b10526b99b5e61555ca9ef4f58042 1 parent 5bb43d8
nicolassatragno authored
Showing with 3 additions and 20 deletions.
  1. +0 −5 Gemfile
  2. +3 −15 Gemfile.lock
View
5 Gemfile
@@ -14,14 +14,9 @@ gem 'bootstrap-sass', '~> 2.0.0'
gem 'fast_gettext'
gem 'gettext_i18n_rails', '>= 0.4.3'
gem 'rails-i18n'
-gem 'sass-rails', '~> 3.2.3'
-gem 'bootstrap-sass', '~> 2.0.0'
group :assets do
-<<<<<<< HEAD
-=======
gem 'sass-rails', '~> 3.2.3'
->>>>>>> master
gem 'coffee-rails', '~> 3.2.1'
gem 'therubyracer', '~> 0.10.2', :platform => :ruby
gem 'uglifier', '>= 1.0.3'
View
18 Gemfile.lock
@@ -57,12 +57,9 @@ GEM
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
-<<<<<<< HEAD
fast_gettext (0.6.11)
ffi (1.0.11)
-=======
ffi (1.2.0)
->>>>>>> master
gems (0.7.0)
gettext (2.3.3)
locale
@@ -93,17 +90,14 @@ GEM
libv8 (3.3.10.4)
libwebsocket (0.1.7.1)
addressable
-<<<<<<< HEAD
listen (0.4.6)
rb-fchange (~> 0.0.5)
rb-fsevent (~> 0.9.1)
rb-inotify (~> 0.8.8)
+ listen (0.6.0)
locale (2.0.8)
-=======
websocket
- listen (0.6.0)
lumberjack (1.0.2)
->>>>>>> master
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -157,15 +151,12 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
-<<<<<<< HEAD
rspec (~> 2.10.0)
ruby_parser (3.1.0)
- sexp_processor (~> 4.1)
-=======
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.12.0)
->>>>>>> master
+ sexp_processor (~> 4.1)
rubyzip (0.9.9)
sass (3.2.3)
sass-rails (3.2.5)
@@ -177,13 +168,10 @@ GEM
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
-<<<<<<< HEAD
sexp_processor (4.1.3)
- sprockets (2.1.2)
-=======
slop (3.3.3)
+ sprockets (2.1.2)
sprockets (2.1.3)
->>>>>>> master
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
Please sign in to comment.
Something went wrong with that request. Please try again.