mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-20 19:31:56 -05:00
Code Issues Packages Projects Releases 156 Wiki Activity

[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

Browse Source
This commit is contained in:
JCOR11599
2022-09-20 19:08:20 +00:00
parent 9ea196bcbd
commit 174ac3c8a1
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/gen/proto/dolt/services/remotesapi/v1alpha1/chunkstore.pb.go
+3 -2
View File
@@ -21,11 +21,12 @@
package remotesapi
import (
reflect "reflect"
sync "sync"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
timestamppb "google.golang.org/protobuf/types/known/timestamppb"
reflect "reflect"
sync "sync"
)
const (
go/gen/proto/dolt/services/remotesapi/v1alpha1/chunkstore_grpc.pb.go
+1
View File
@@ -8,6 +8,7 @@ package remotesapi
import (
context "context"
grpc "google.golang.org/grpc"
codes "google.golang.org/grpc/codes"
status "google.golang.org/grpc/status"
go/libraries/doltcore/sqle/dfunctions/dolt_conflicts_resolve.go
+2 -2
View File
@@ -17,8 +17,6 @@ package dfunctions
import (
"errors"
"fmt"
"github.com/dolthub/dolt/go/libraries/doltcore/doltdb/durable"
"github.com/dolthub/dolt/go/libraries/doltcore/sqle/dtables"
"io"
"strings"
@@ -26,10 +24,12 @@ import (
"github.com/dolthub/dolt/go/cmd/dolt/cli"
"github.com/dolthub/dolt/go/libraries/doltcore/doltdb"
"github.com/dolthub/dolt/go/libraries/doltcore/doltdb/durable"
"github.com/dolthub/dolt/go/libraries/doltcore/merge"
"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/sqle/dtables"
"github.com/dolthub/dolt/go/store/types"
)