aboutsummaryrefslogtreecommitdiffhomepage
path: root/examples/objective-c/helloworld
diff options
context:
space:
mode:
authorGravatar Jorge Canizales <jcanizales@google.com>2016-08-08 18:39:56 -0700
committerGravatar Jorge Canizales <jcanizales@google.com>2016-08-08 18:39:56 -0700
commit8ac55f8a8c6f43dd1b13d6390ce23babdb1a21c5 (patch)
treeb83cfc66e079ada9335294466e74243d4c3660a4 /examples/objective-c/helloworld
parenta9b1c5cbe1e5266943df0715d3acb976ae8aa01f (diff)
parent97f6994b98a273f5007044afcaf48909f147097d (diff)
Solve merge conflict at gRPC-ProtoRPC.podspec
Diffstat (limited to 'examples/objective-c/helloworld')
-rw-r--r--examples/objective-c/helloworld/HelloWorld.podspec2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/objective-c/helloworld/HelloWorld.podspec b/examples/objective-c/helloworld/HelloWorld.podspec
index 8adb799a7c..437f9f40fc 100644
--- a/examples/objective-c/helloworld/HelloWorld.podspec
+++ b/examples/objective-c/helloworld/HelloWorld.podspec
@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
src = "../../protos"
# Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients.
- s.dependency "!ProtoCompiler-gRPCPlugin", "~> 1.0.0-pre1"
+ s.dependency "!ProtoCompiler-gRPCPlugin", "~> 1.0.0-pre1.2"
# Pods directory corresponding to this app's Podfile, relative to the location of this podspec.
pods_root = 'Pods'