Fix

dolthub · Oct 3, 2024 · 4587cad · 4587cad
1 parent d803b92
commit 4587cad
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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
 	}