commit 9c0087c3d41c0643d73a3d42cf31399059b2ad7c
author gregce <gregce@google.com> Wed Feb 02 09:08:46 2022 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Feb 02 09:10:12 2022 -0800
tree 3212147be7803a27686e9a0f95d83fc69abbe038
parent 76c8c3a35776ecd6c568cf4ef1b6f2d2f52c0280

Replace @Override accidentally removed from a merge conflict

For https://github.com/bazelbuild/bazel/issues/6526.

PiperOrigin-RevId: 425899368

src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
index 82cb5a8..16e289b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
@@ -546,6 +546,7 @@
       return onlyMandatoryOutput == null || onlyMandatoryOutput.equals(output);
     }
 
+    @Override
     public boolean stripOutputPaths() {
       return stripOutputPaths;
     }