Merge v3.33 into v3.34 #5384
Annotations
2 errors and 10 warnings
|
|
|
|
|
.golangci.yml#L1
.golangci.yml has a conflict when merging TheThingsIndustries/lorawan-stack:v3.34.
|
|
DEVELOPMENT.md#L1
DEVELOPMENT.md has a conflict when merging TheThingsIndustries/lorawan-stack:v3.34.
|
|
Dockerfile#L1
Dockerfile has a conflict when merging TheThingsIndustries/lorawan-stack:v3.34.
|
|
pkg/applicationserver/config.go#L1
pkg/applicationserver/config.go has a conflict when merging TheThingsIndustries/lorawan-stack:v3.34.
|
|
pkg/applicationserver/io/pubsub/redis/registry.go#L1
pkg/applicationserver/io/pubsub/redis/registry.go has a conflict when merging TheThingsIndustries/lorawan-stack:v3.34.
|
|
pkg/applicationserver/io/web/redis/registry.go#L1
pkg/applicationserver/io/web/redis/registry.go has a conflict when merging TheThingsIndustries/lorawan-stack:v3.34.
|
|
pkg/applicationserver/metadata/redis/location_cache.go#L1
pkg/applicationserver/metadata/redis/location_cache.go has a conflict when merging TheThingsIndustries/lorawan-stack:v3.34.
|
|
pkg/gatewayserver/gatewayserver.go#L1
pkg/gatewayserver/gatewayserver.go has a conflict when merging TheThingsIndustries/lorawan-stack:v3.34.
|
|
pkg/ttnpb/user.pb.go#L1
pkg/ttnpb/user.pb.go has a conflict when merging TheThingsIndustries/lorawan-stack:v3.34.
|
|
pkg/webui/console/components/total-end-devices-upseller-panel/index.js#L1
pkg/webui/console/components/total-end-devices-upseller-panel/index.js has a conflict when merging TheThingsIndustries/lorawan-stack:v3.34.
|
The logs for this run have expired and are no longer available.
Loading