zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-04-30 12:07:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge error

Browse source
This commit is contained in:
Weimin Yu 2019-06-17 13:28:47 -04:00
parent 1a1bc0711b
commit 2fd3d837da
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
java_common.gradle
View file

@ -21,7 +21,6 @@ tasks.withType(JavaCompile).configureEach {
if (System.getProperty('no_werror') != 'true') { if (System.getProperty('no_werror') != 'true') {
options.compilerArgs << "-Werror" options.compilerArgs << "-Werror"
} }
options.compilerArgs << "-Werror"
options.errorprone.disableWarningsInGeneratedCode = true options.errorprone.disableWarningsInGeneratedCode = true
options.errorprone.errorproneArgumentProviders.add([ options.errorprone.errorproneArgumentProviders.add([
asArguments: { asArguments: {