diff options
author | Andre Arko <andre@arko.net> | 2013-07-03 13:08:21 -0700 |
---|---|---|
committer | Andre Arko <andre@arko.net> | 2013-07-03 13:39:32 -0700 |
commit | ca10d9a33f719915b1b8af2331ff88de89d26844 (patch) | |
tree | d687cb445304ea60d1e5e265a2bbacc959a953e2 /spec/realworld | |
parent | 83786c196eb675c843e9117c4ce0e41bc606cc13 (diff) | |
parent | 8475ccb02431850d835b455d15ce57c6a9ea790e (diff) | |
download | bundler-ca10d9a33f719915b1b8af2331ff88de89d26844.tar.gz |
Merge branch '1-3-stable'
Conflicts:
spec/bundler/gem_helper_spec.rb
Diffstat (limited to 'spec/realworld')
-rw-r--r-- | spec/realworld/dependency_api_spec.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/realworld/dependency_api_spec.rb b/spec/realworld/dependency_api_spec.rb index ad4756c2..3d773d57 100644 --- a/spec/realworld/dependency_api_spec.rb +++ b/spec/realworld/dependency_api_spec.rb @@ -57,5 +57,4 @@ describe "gemcutter's dependency API", :realworld => true do should_be_installed "rack 1.0.0" end end - end |