Merge pull request #3611 from nicolasnoble/stop-fighting

Making template agree with clang-format.

gRPC.podspec

@@ -46,6 +46,7 @@ Pod::Spec.new do |s|
   s.source = { :git => 'https://github.com/grpc/grpc.git',
                :tag => "release-#{version.gsub(/\./, '_')}-objectivec-#{version}" }
 
+
   s.ios.deployment_target = '7.1'
   s.osx.deployment_target = '10.9'
   s.requires_arc = true

src/core/surface/version.c

@@ -36,6 +36,4 @@
 
 #include <grpc/grpc.h>
 
-const char *grpc_version_string(void) {
+const char *grpc_version_string(void) { return "0.11.0.0"; }
-	return "0.11.0.0";
-}

templates/src/core/surface/version.c.template

@@ -38,6 +38,5 @@
   
   #include <grpc/grpc.h>
   
-  const char *grpc_version_string(void) {
+  const char *grpc_version_string(void) { \
-  	return "${settings.version.major}.${settings.version.minor}.${settings.version.micro}.${settings.version.build}";
+  return "${settings.version.major}.${settings.version.minor}.${settings.version.micro}.${settings.version.build}"; }
-  }