resolve merge conflict

hashicorp · Mar 23, 2022 · 087c999 · 087c999
1 parent f2b630b
commit 087c999
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/pkg/server/gen/server.pb.json.go b/pkg/server/gen/server.pb.json.go