[Gemfile][IntegrationSpecs] Return to master after merge

Gemfile

@@ -12,7 +12,7 @@ gemspec
 
 group :development do
   cp_gem 'claide',               'CLAide'
-  cp_gem 'cocoapods-core',       'Core', 'resolver'
+  cp_gem 'cocoapods-core',       'Core'
   cp_gem 'cocoapods-downloader', 'cocoapods-downloader'
   cp_gem 'cocoapods-plugins',    'cocoapods-plugins'
   cp_gem 'cocoapods-trunk',      'cocoapods-trunk'

Gemfile.lock

@@ -7,8 +7,8 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/Core.git
-  revision: 802401562948abf9f4f417ace4cd8e9bb8b08859
-  branch: resolver
+  revision: 2a425f9e040d5ad3f94cb0e370fc510f6a16aa32
+  branch: master
   specs:
     cocoapods-core (0.34.4)
       activesupport (>= 3.2.15)

cocoapods-integration-specs @ c05bd4df

-Subproject commit afc3bdb824e79fe2f99361aa9b4525cda4cc95d1
+Subproject commit c05bd4dfaba58359a376a8bdee56ef4743d23aba