From a336bda983afdf794a481949219167a62009eb54 Mon Sep 17 00:00:00 2001
From: Stanley Cheung <stanleycheung@google.com>
Date: Wed, 17 May 2017 23:15:45 -0700
Subject: [PATCH] Fixed missed conflicts - use constants.logVerbosity instead

---
 src/server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server.js b/src/server.js
index 75426a62..1d9cc7d2 100644
--- a/src/server.js
+++ b/src/server.js
@@ -782,7 +782,7 @@ Server.prototype.addService = function(service, implementation) {
 };
 
 var logAddProtoServiceDeprecationOnce = _.once(function() {
-    common.log(grpc.logVerbosity.INFO,
+    common.log(constants.logVerbosity.INFO,
                'Server#addProtoService is deprecated. Use addService instead');
 });