Merge.

eamonnmcmanus · eamonnmcmanus · commit ea88c9a5ff10 · 2020-06-16T16:35:53.000-07:00
diff --git a/functions/slack/src/main/java/functions/SlackSlashCommand.java b/functions/slack/src/main/java/functions/SlackSlashCommand.java
@@ -55,6 +55,7 @@ public SlackSlashCommand() throws IOException, GeneralSecurityException {
   SlackSlashCommand(SlackSignature.Verifier verifier) throws IOException, GeneralSecurityException {
     this(verifier, API_KEY);
   }
+<<<<<<< HEAD
 
   SlackSlashCommand(SlackSignature.Verifier verifier, String apiKey)
       throws IOException, GeneralSecurityException {
@@ -73,6 +74,15 @@ private static String getenv(String name) {
       value = "MISSING";
     }
     return value;
+=======
+
+  SlackSlashCommand(SlackSignature.Verifier verifier, String apiKey)
+      throws IOException, GeneralSecurityException {
+    this.verifier = verifier;
+    this.apiKey = apiKey;
+    this.kgClient = new Kgsearch.Builder(
+        GoogleNetHttpTransport.newTrustedTransport(), new JacksonFactory(), null).build();
+>>>>>>> 3120eb78f6b9617de12177871ecfe793d9d6215a
   }
   // [END functions_slack_setup]
 
