From f21b1c9c2c53fa757a05e8ef8c25a242b5db7ceb Mon Sep 17 00:00:00 2001 From: JCOR11599 Date: Wed, 28 Sep 2022 22:35:59 +0000 Subject: [PATCH] [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh --- .../doltcore/sqle/dprocedures/dolt_conflicts_resolve.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/go/libraries/doltcore/sqle/dprocedures/dolt_conflicts_resolve.go b/go/libraries/doltcore/sqle/dprocedures/dolt_conflicts_resolve.go index 47c8d84292..5d8811c1d5 100644 --- a/go/libraries/doltcore/sqle/dprocedures/dolt_conflicts_resolve.go +++ b/go/libraries/doltcore/sqle/dprocedures/dolt_conflicts_resolve.go @@ -17,9 +17,10 @@ package dprocedures import ( "errors" "fmt" - "github.com/dolthub/go-mysql-server/sql" "io" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/dolt/go/cmd/dolt/cli" "github.com/dolthub/dolt/go/libraries/doltcore/conflict" "github.com/dolthub/dolt/go/libraries/doltcore/doltdb"