Merge branch 'fulghum/schema-merge' of https://github.com/dolthub/dolt …

…into fulghum/schema-merge
dolthub · Jul 31, 2023 · 025bd1d · 025bd1d
2 parents 4f488b1 + e5cfa46
commit 025bd1d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/go/libraries/doltcore/merge/merge_schema.go b/go/libraries/doltcore/merge/merge_schema.go
@@ -18,12 +18,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	errorkinds "gopkg.in/src-d/go-errors.v1"
 	"sort"
 	"strings"
 
 	sqle "github.com/dolthub/go-mysql-server"
 	"github.com/dolthub/go-mysql-server/sql"
+	errorkinds "gopkg.in/src-d/go-errors.v1"
 
 	"github.com/dolthub/dolt/go/libraries/doltcore/doltdb"
 	"github.com/dolthub/dolt/go/libraries/doltcore/schema"