From 92d3bc9c9f11c3a013f0006ac5694944fecc8191 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Sun, 8 Oct 2017 15:36:11 -0400 Subject: 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 Commit-Queue: Ben Wagner --- infra/bots/tasks.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'infra/bots/tasks.json') diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 6c1166d7dc..82371ea8cc 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -9993,7 +9993,7 @@ { "name": "skia/bots/skp", "path": "skp", - "version": "version:88" + "version": "version:89" }, { "name": "skia/bots/svg", @@ -10087,7 +10087,7 @@ { "name": "skia/bots/skp", "path": "skp", - "version": "version:88" + "version": "version:89" }, { "name": "skia/bots/svg", @@ -17978,7 +17978,7 @@ { "name": "skia/bots/skp", "path": "skp", - "version": "version:88" + "version": "version:89" }, { "name": "skia/bots/svg", @@ -18072,7 +18072,7 @@ { "name": "skia/bots/skp", "path": "skp", - "version": "version:88" + "version": "version:89" }, { "name": "skia/bots/svg", -- cgit v1.2.3