From 3d2ea83dc9bb3f2e164db48ecabcad3e6807d54a Mon Sep 17 00:00:00 2001 From: JCOR11599 Date: Tue, 27 Sep 2022 07:23:52 +0000 Subject: [PATCH] [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh --- .../doltcore/sqle/dfunctions/dolt_conflicts_resolve.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/go/libraries/doltcore/sqle/dfunctions/dolt_conflicts_resolve.go b/go/libraries/doltcore/sqle/dfunctions/dolt_conflicts_resolve.go index 165fc077e0..93d8b3a052 100644 --- a/go/libraries/doltcore/sqle/dfunctions/dolt_conflicts_resolve.go +++ b/go/libraries/doltcore/sqle/dfunctions/dolt_conflicts_resolve.go @@ -18,15 +18,13 @@ import ( "bytes" "errors" "fmt" - "github.com/dolthub/dolt/go/libraries/doltcore/conflict" - "github.com/dolthub/dolt/go/libraries/doltcore/table" - "github.com/dolthub/dolt/go/libraries/utils/filesys" "io" "strings" "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" "github.com/dolthub/dolt/go/libraries/doltcore/doltdb/durable" "github.com/dolthub/dolt/go/libraries/doltcore/env" @@ -34,7 +32,9 @@ import ( "github.com/dolthub/dolt/go/libraries/doltcore/row" "github.com/dolthub/dolt/go/libraries/doltcore/schema" "github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess" + "github.com/dolthub/dolt/go/libraries/doltcore/table" "github.com/dolthub/dolt/go/libraries/doltcore/table/editor" + "github.com/dolthub/dolt/go/libraries/utils/filesys" "github.com/dolthub/dolt/go/store/hash" "github.com/dolthub/dolt/go/store/prolly" "github.com/dolthub/dolt/go/store/prolly/tree"