diff options
author | Jorge Canizales <jcanizales@google.com> | 2016-08-08 18:39:56 -0700 |
---|---|---|
committer | Jorge Canizales <jcanizales@google.com> | 2016-08-08 18:39:56 -0700 |
commit | 8ac55f8a8c6f43dd1b13d6390ce23babdb1a21c5 (patch) | |
tree | b83cfc66e079ada9335294466e74243d4c3660a4 /gRPC-ProtoRPC.podspec | |
parent | a9b1c5cbe1e5266943df0715d3acb976ae8aa01f (diff) | |
parent | 97f6994b98a273f5007044afcaf48909f147097d (diff) |
Solve merge conflict at gRPC-ProtoRPC.podspec
Diffstat (limited to 'gRPC-ProtoRPC.podspec')
-rw-r--r-- | gRPC-ProtoRPC.podspec | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/gRPC-ProtoRPC.podspec b/gRPC-ProtoRPC.podspec index 115e0752f4..d8367e0e5e 100644 --- a/gRPC-ProtoRPC.podspec +++ b/gRPC-ProtoRPC.podspec @@ -1,9 +1,3 @@ -# GRPC CocoaPods podspec -# This file has been automatically generated from a template file. -# Please look at the templates directory instead. -# This file can be regenerated from the template by running -# tools/buildgen/generate_projects.sh - # Copyright 2015, Google Inc. # All rights reserved. # @@ -61,7 +55,7 @@ Pod::Spec.new do |s| s.dependency 'gRPC', version s.dependency 'gRPC-RxLibrary', version - s.dependency 'Protobuf', '~> 3.0.0-beta-3.1' + s.dependency 'Protobuf', '~> 3.0' s.pod_target_xcconfig = { # This is needed by all pods that depend on Protobuf: 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1', |