diff options
| author |  Ben Wagner <benjaminwagner@google.com> | 2017-10-08 15:36:11 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-08 19:57:02 +0000 |
| commit | 92d3bc9c9f11c3a013f0006ac5694944fecc8191 (patch) | |
| tree | 5ef39d9935615b3b91fd324300ea99f36982af63 /docs | |
| parent | 2d861e9514b86a62a8c09c67c0ee8a4c968aad60 (diff) | |
Fix merge conflict.
This resolves the conflict between
https://skia-review.googlesource.com/57120 and
https://skia-review.googlesource.com/57081.
No-Try: true
Change-Id: I45f47eb13dd7151b37b3b37f821232a02b9a43ff
Reviewed-on: https://skia-review.googlesource.com/57082
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions