From 9ee60a8fd9648c3d8f483ea3e945235130d7c2b2 Mon Sep 17 00:00:00 2001
From: Weimin Yu <weiminyu@google.com>
Date: Mon, 17 Jun 2019 13:28:47 -0400
Subject: [PATCH] Fix merge error

---
 java_common.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java_common.gradle b/java_common.gradle
index 988e608cc..2e1223002 100644
--- a/java_common.gradle
+++ b/java_common.gradle
@@ -21,7 +21,6 @@ tasks.withType(JavaCompile).configureEach {
     if (System.getProperty('no_werror') != 'true') {
         options.compilerArgs << "-Werror"
     }
-    options.compilerArgs << "-Werror"
     options.errorprone.disableWarningsInGeneratedCode = true
     options.errorprone.errorproneArgumentProviders.add([
             asArguments: {