Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 2066c9a

Browse files
committedNov 6, 2024·
feat: regen code
1 parent a55819a commit 2066c9a

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed
 

‎tencentcloud/connectivity/client.go

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -212,16 +212,6 @@ type TencentCloudClient struct {
212212
controlcenterConn *controlcenter.Client
213213
thpcConn *thpc.Client
214214
//omit nil client
215-
<<<<<<< HEAD
216-
omitNilConn *common.Client
217-
emrv20190103Conn *emr.Client
218-
teov20220901Conn *teo.Client
219-
sslv20191205Conn *sslCertificate.Client
220-
postgresv20170312Conn *postgre.Client
221-
cfwv20190904Conn *cfw.Client
222-
ccnv20170312Conn *vpc.Client
223-
cloudauditv20190319Conn *audit.Client
224-
=======
225215
omitNilConn *common.Client
226216
emrv20190103Conn *emr.Client
227217
teov20220901Conn *teo.Client
@@ -230,7 +220,7 @@ type TencentCloudClient struct {
230220
cfwv20190904Conn *cfw.Client
231221
ccnv20170312Conn *vpc.Client
232222
tcssv20201101Conn *tcss.Client
233-
>>>>>>> master
223+
cloudauditv20190319Conn *audit.Client
234224
}
235225

236226
// NewClientProfile returns a new ClientProfile

0 commit comments

Comments
 (0)
Please sign in to comment.