From df4c902b8b270ba8571aafbf6954e5b62c41499b Mon Sep 17 00:00:00 2001 From: fulghum Date: Mon, 22 May 2023 20:50:39 +0000 Subject: [PATCH] [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh --- go/libraries/doltcore/merge/merge_prolly_rows.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/libraries/doltcore/merge/merge_prolly_rows.go b/go/libraries/doltcore/merge/merge_prolly_rows.go index 038053bcf1..ad82966f30 100644 --- a/go/libraries/doltcore/merge/merge_prolly_rows.go +++ b/go/libraries/doltcore/merge/merge_prolly_rows.go @@ -20,7 +20,6 @@ import ( "encoding/json" "errors" "fmt" - errorkinds "gopkg.in/src-d/go-errors.v1" "io" "github.com/dolthub/go-mysql-server/memory" @@ -29,6 +28,7 @@ import ( "github.com/dolthub/go-mysql-server/sql/parse" "github.com/dolthub/go-mysql-server/sql/planbuilder" "github.com/dolthub/go-mysql-server/sql/transform" + errorkinds "gopkg.in/src-d/go-errors.v1" "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" "github.com/dolthub/dolt/go/libraries/doltcore/doltdb/durable"