Fix merge problem

7 months ago · ebfab67635
parent 1951078065
commit ebfab67635
1 changed files with 0 additions and 1 deletions
--- a/.github/workflows/test_java.yml
+++ b/.github/workflows/test_java.yml
@ -54,7 +54,6 @@ jobs:
            image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-cf84e92285ca133b9c8104ad7b14d70e953cbb8e
            targets: //java/... //java/internal:java_version //compatibility/...
            flags: --enable_bzlmod
->>>>>>> upstream/main
          - name: aarch64
            version: 'aarch64'
            image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-63dd26c0c7a808d92673a3e52e848189d4ab0f17