From 30a5908fb1de53080df98df5dcb968190f593259 Mon Sep 17 00:00:00 2001 From: nicktobey Date: Wed, 22 Nov 2023 22:06:03 +0000 Subject: [PATCH] [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh --- go/libraries/doltcore/merge/merge_schema.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/libraries/doltcore/merge/merge_schema.go b/go/libraries/doltcore/merge/merge_schema.go index 6fd655aee9..8366d402a7 100644 --- a/go/libraries/doltcore/merge/merge_schema.go +++ b/go/libraries/doltcore/merge/merge_schema.go @@ -18,7 +18,6 @@ import ( "context" "errors" "fmt" - "github.com/dolthub/dolt/go/store/prolly/tree" "sort" "strings" @@ -28,6 +27,7 @@ import ( "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/prolly/tree" storetypes "github.com/dolthub/dolt/go/store/types" )