冲突

2025-07-10 16:56:45 +08:00 · 2025-07-10 16:53:36 +08:00
1 changed files with 1 additions and 0 deletions
--- a/bk_aidk/bk_avdk/bk_idk/tools/build_tools/part_table_tools/config/gen_files_list.txt
+++ b/bk_aidk/bk_avdk/bk_idk/tools/build_tools/part_table_tools/config/gen_files_list.txt
@ -1 +1,2 @@
 /home/harmony/work/bk7258_iR58/bk_aidk/bk_avdk/bk_idk/tools/env_tools/beken_packager/partition_bk7256_ota_a_new.json
+
Author	SHA1	Message	Date
dianke3yu	9149c2deff	冲突	2025-07-10 16:56:45 +08:00
dianke3yu	0e86aede0d	冲突	2025-07-10 16:53:36 +08:00
				`@ -1 +1,2 @@`
				`/home/harmony/work/bk7258_iR58/bk_aidk/bk_avdk/bk_idk/tools/env_tools/beken_packager/partition_bk7256_ota_a_new.json`