Skip to content

Commit

Permalink
Merge branch 'master' into feature/wallets
Browse files Browse the repository at this point in the history 
# Conflicts:
#	api/helloworld/v1/error_reason.pb.go
#	api/helloworld/v1/kubecit.pb.go
#	api/helloworld/v1/kubecit.pb.validate.go
#	api/helloworld/v1/kubecit.proto
#	api/helloworld/v1/kubecit_grpc.pb.go
#	api/helloworld/v1/kubecit_http.pb.go
#	cmd/kubecit-service/wire_gen.go
#	ent/client.go
#	ent/runtime.go
#	go.sum
#	internal/biz/biz.go
#	internal/data/data.go
#	internal/service/service.go
  • Loading branch information
@kcxg
kcxg committed Sep 19, 2023
2 parents 0e9b5a3 + f6f9918 commit 5b15eeb
Show file tree
Hide file tree
Showing 39 changed files with 6,279 additions and 2,296 deletions.
79 changes: 40 additions & 39 deletions api/helloworld/v1/error_reason.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5b15eeb

Please sign in to comment.