diff options
| author | Anton Hansson <hansson@google.com> | 2021-02-19 15:27:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-19 15:27:29 +0000 |
| commit | a6bf4a189cbd3dcbcc014540169e54145d8700bc (patch) | |
| tree | 106fc88c8407ce37f7b4bafcb6137d0562fa6a89 /java/java.go | |
| parent | 052398b1ce9a853e2ad88dce2a83d86643c2cdac (diff) | |
| parent | 771fd524f247c63943ba63a83ef202c46e2502df (diff) | |
Merge "Disallow using error-prone merge strategies"
Diffstat (limited to 'java/java.go')
0 files changed, 0 insertions, 0 deletions