update openapi

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

generate.go

@@ -4,11 +4,8 @@ package main
 //go:generate protoc -I. -I./api --go_out=paths=source_relative:. ./api/http.proto
 //go:generate protoc -I. -I./api --go_out=paths=source_relative:. ./api/field_behavior.proto
 //go:generate protoc -I. -I./api --go_out=paths=source_relative:. ./api/httpbody.proto
-<<<<<<< HEAD
 //go:generate protoc -I. -I./api --go_out=paths=source_relative:. ./api/micro.proto
-=======
 //go:generate protoc -I. -I./api --go_out=paths=source_relative:. ./api/client.proto
->>>>>>> 75c244f1a60f (update)
 //go:generate protoc -I. -I./openapiv2 --go_out=paths=source_relative:. ./openapiv2/annotations.proto
 //go:generate protoc -I. -I./openapiv2 --go_out=paths=source_relative:. ./openapiv2/openapiv2.proto
 //go:generate protoc -I. -I./openapiv3 --go_out=paths=source_relative:. ./openapiv3/annotations.proto

openapiv2/openapiv2.go

@@ -1,3 +1,4 @@
+package openapiv2 // import "go.unistack.org/micro-proto/v3/openapiv2"
 // Copyright 2020 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +15,6 @@
 
 // THIS FILE IS AUTOMATICALLY GENERATED.
 
-package openapiv2
-
 import (
 	"fmt"
 	"regexp"

openapiv2/openapiv2.proto

@@ -663,3 +663,4 @@ message Xml {
   bool wrapped = 5;
   repeated NamedAny vendor_extension = 6;
 }
+