Missed a conflict marker.

eamonnmcmanus · eamonnmcmanus · commit acc353bb160c · 2020-04-28T17:52:31.000-07:00
diff --git a/functions/ocr/ocr-translate-text/src/main/java/functions/OcrTranslateText.java b/functions/ocr/ocr-translate-text/src/main/java/functions/OcrTranslateText.java
@@ -96,7 +96,6 @@ public void accept(PubSubMessage pubSubMessage, Context context) {
     } catch (InterruptedException | ExecutionException e) {
       // Log error (since these exception types cannot be thrown by a function)
       logger.log(Level.SEVERE, "Error publishing translation save request: " + e.getMessage(), e);
-<<<<<<< HEAD
     }
   }
 
@@ -105,8 +104,6 @@ private static String getenv(String name) {
     if (value == null) {
       logger.warning("Environment variable " + name + " was not set");
       value = "MISSING";
-=======
->>>>>>> master
     }
     return value;
   }

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,6 @@ public void accept(PubSubMessage pubSubMessage, Context context) {`
`96`	`96`	`} catch (InterruptedException \| ExecutionException e) {`
`97`	`97`	`// Log error (since these exception types cannot be thrown by a function)`
`98`	`98`	`logger.log(Level.SEVERE, "Error publishing translation save request: " + e.getMessage(), e);`
`99`		`-<<<<<<< HEAD`
`100`	`99`	`}`
`101`	`100`	`}`
`102`	`101`
`@@ -105,8 +104,6 @@ private static String getenv(String name) {`
`105`	`104`	`if (value == null) {`
`106`	`105`	`logger.warning("Environment variable " + name + " was not set");`
`107`	`106`	`value = "MISSING";`
`108`		`-=======`
`109`		`->>>>>>> master`
`110`	`107`	`}`
`111`	`108`	`return value;`
`112`	`109`	`}`