diff options
| author |  Thomas Van Lenten <thomasvl@google.com> | 2016-08-15 13:31:04 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-08-15 13:31:04 -0400 |
| commit | 336ee28b34816e279fc0bc26d2b5d1e5ea233976 (patch) | |
| tree | ca0e50bbd800d991d22b5e22b5cf6a81e9a9b843 /.gitignore | |
| parent | a2484208c3291ea522a891114d2821829bd09083 (diff) | |
| parent | f9d93f358d04b73efad49f51f0e879f77eaf4f91 (diff) | |
Merge pull request #1960 from jskeet/oneof
Regenerate conformance files to include extra oneof fields.
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions