auto ci

plugin/dapp/coinsx/types/coinsx.pb.go

 // Code generated by protoc-gen-go. DO NOT EDIT.
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
 // versions:
 // 	protoc-gen-go v1.26.0
 // 	protoc        v3.9.1
->>>>>>> upstream/master
-=======
-// versions:
-// 	protoc-gen-go v1.26.0
-// 	protoc        v3.9.1
->>>>>>> afeac8d90c67fe38d642eca9db167d33a67297a9
 // source: coinsx.proto
 
 package types
@@ -20,28 +11,6 @@ import (
 	sync "sync"
 
 	types "github.com/33cn/chain33/types"
-<<<<<<< HEAD
-<<<<<<< HEAD
-	proto "github.com/golang/protobuf/proto"
-	math "math"
-=======
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
->>>>>>> upstream/master
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-<<<<<<< HEAD
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
-=======
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 )
@@ -52,10 +21,7 @@ const (
 	// Verify that runtime/protoimpl is sufficiently up-to-date.
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
->>>>>>> afeac8d90c67fe38d642eca9db167d33a67297a9
 
-=======
->>>>>>> upstream/master
 //kvmvcc statedb not support 0 value
 type TransferFlag int32