diff options
| author |  Ben Wagner <benjaminwagner@google.com> | 2017-05-01 11:09:18 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-01 15:18:55 +0000 |
| commit | 489530e06cb7dde13db1271dbf55452d79cd119d (patch) | |
| tree | b260f0f29977cad10c9f8bbc8664c9a740748b51 /infra | |
| parent | 8d9201a798049e277b6b29f16e9a659d9b63d1fb (diff) | |
Fix merge conflict.
I accidentally caused a merged conflict between
https://skia-review.googlesource.com/14656 and
https://skia-review.googlesource.com/14821
No-Try: true
Change-Id: Ib00b293019fddc3951a5d413744b9d186dd103d8
Reviewed-on: https://skia-review.googlesource.com/14840
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra')
| -rw-r--r-- | infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE.json b/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE.json index f5ab534f16..9a18e4b63c 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE.json +++ b/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE.json @@ -181,9 +181,9 @@ "gitHash", "abc123", "swarming_bot_id", - "", + "skia-bot-123", "swarming_task_id", - "", + "123456", "--key", "arch", "x86_64", |