resolve conflicts

Author: yaozheng-fang

veadk/cli/cli_deploy.py

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Copyright (c) 2025 Beijing Volcano Engine Technology Co., Ltd. and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+=======
+>>>>>>> 4d1c08b (resolve conflicts)
 import click