Merge branch 'master' of github.com:Bushido/Kandan

kandanapp · Mar 30, 2012 · d511cab · d511cab
2 parents 41b02b8 + 6001c75
commit d511cab
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/Gemfile b/Gemfile
@@ -31,7 +31,7 @@ group :assets do
   gem 'uglifier', '>= 1.0.3'
 end
 
-gem 'tane', :path => "../tane", :group => :development
+# gem 'tane', :path => "../tane", :group => :development
 
 # Test gems, obviously
 group :test do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,14 +1,3 @@
-PATH
-  remote: ../tane
-  specs:
-    tane (0.0.3)
-      awesome_print
-      erubis
-      highline
-      launchy
-      rake
-      rest-client
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -41,7 +30,6 @@ GEM
       multi_json (~> 1.0)
     addressable (2.2.7)
     arel (3.0.2)
-    awesome_print (1.0.2)
     aws-sdk (1.3.8)
       httparty (~> 0.7)
       json (~> 1.4)
@@ -117,8 +105,6 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    launchy (2.1.0)
-      addressable (~> 2.2.6)
     mail (2.4.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -229,6 +215,5 @@ DEPENDENCIES
   sass-rails (~> 3.2.3)
   shoulda-matchers
   sqlite3
-  tane!
   thin
   uglifier (>= 1.0.3)