From 4587cad37f628c5d9112b0be35be620ea0dbb508 Mon Sep 17 00:00:00 2001 From: Taylor Bantle Date: Thu, 3 Oct 2024 12:09:40 -0700 Subject: [PATCH] Fix --- .../doltcore/sqle/dprocedures/dolt_conflicts_resolve.go | 2 +- 1 file changed, 1 insertion(+), 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 72bb17a17d..dc8e28f83b 100644 --- a/go/libraries/doltcore/sqle/dprocedures/dolt_conflicts_resolve.go +++ b/go/libraries/doltcore/sqle/dprocedures/dolt_conflicts_resolve.go @@ -527,7 +527,7 @@ func DoDoltConflictsResolve(ctx *sql.Context, args []string) (int, error) { return 1, err } - err = ResolveDataConflicts(ctx, dSess, ws.WorkingRoot(), dbName, ours, doltdb.ToTableNames(strTableNames, doltdb.DefaultSchemaName)) + err = ResolveDataConflicts(ctx, dSess, ws.WorkingRoot(), dbName, ours, tableNames) if err != nil { return 1, err }