From e7101a7064d3e6da5a946d64bb0e43a77377e2f0 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期四, 22 五月 2025 18:11:43 +0800
Subject: [PATCH] 1.22，提交，待测试，给张博先修改

---
 keil/Objects/uwb_simple_example.build_log.htm |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/keil/Objects/uwb_simple_example.build_log.htm b/keil/Objects/uwb_simple_example.build_log.htm
index 5137997..da11aec 100644
--- a/keil/Objects/uwb_simple_example.build_log.htm
+++ b/keil/Objects/uwb_simple_example.build_log.htm
@@ -22,18 +22,12 @@
  
 <h2>Project:</h2>
 C:\git-mk8000\ChinaUWBProject - 4G\keil\uwb_simple_example.uvprojx
-Project File Date:  05/06/2025
+Project File Date:  05/21/2025
 
 <h2>Output:</h2>
-<<<<<<< HEAD
 *** Using Compiler 'V6.14', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin'
 Build target 'MK8000 Release'
 After Build - User command #1: fromelf.exe --bincombined -o "Output\uwb_simple_example.bin" "C:\git-mk8000\ChinaUWBProject - 4G\keil\Objects\uwb_simple_example.axf"
-=======
-*** Using Compiler 'V6.14', folder: 'D:\keil\ARM\ARMCLANG\Bin'
-Build Project 'uwb_simple_example' - Target 'MK8000 Release'
-After Build - User command #1: fromelf.exe --bincombined -o "Output\uwb_simple_example.bin" "D:\zhangbo\2024\Code\ChinaUWB\山东移植简化版\ChinaUWBProject\keil\Objects\uwb_simple_example.axf"
->>>>>>> 4a32430b606b5bc69d1f65b00b78c0641bf7d6fc
 ".\Objects\uwb_simple_example.axf" - 0 Error(s), 0 Warning(s).
 
 <h2>Software Packages used:</h2>
@@ -48,7 +42,7 @@
   C:\Keil_v5\ARM\PACK\MKSEMI\MK800X_DFP\1.0.3\Device\Include
 
 <h2>Collection of Component Files used:</h2>
-Build Time Elapsed:  00:00:03
+Build Time Elapsed:  00:00:01
 </pre>
 </body>
 </html>

--
Gitblit v1.9.3