From 2b07faacf6d1ce3de7ace73af366e5b84e652c14 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 13 十一月 2024 16:37:43 +0800
Subject: [PATCH] Merge branch '免布线标签-lora-泰斗GPS' of http://47.108.70.204:60062/r/XRange_Tag into 免布线标签-lora-泰斗GPS

---
 MDK-ARM/L051/L051.build_log.htm |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/MDK-ARM/L051/L051.build_log.htm b/MDK-ARM/L051/L051.build_log.htm
index 945dbda..7584a37 100644
--- a/MDK-ARM/L051/L051.build_log.htm
+++ b/MDK-ARM/L051/L051.build_log.htm
@@ -21,13 +21,21 @@
 Dialog DLL:      TARMCM1.DLL V1.14.2.0
  
 <h2>Project:</h2>
+<<<<<<< HEAD
+C:\git\XRange_Tag -Lora-R - GPS\MDK-ARM\L051.uvprojx
+Project File Date:  11/12/2024
+=======
 E:\GIT\XRange_Tag\MDK-ARM\L051.uvprojx
 Project File Date:  10/29/2024
+>>>>>>> c8cbb8205d69b4120122a7d0923edcca611399ef
 
 <h2>Output:</h2>
 *** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\Keil_v5\ARM\ARMCC\Bin'
 Build target 'L051'
 Note: source file '..\Src\radio\crc.c' - object file renamed from 'L051\crc.o' to 'L051\crc_1.o'.
+<<<<<<< HEAD
+"L051\L051.axf" - 0 Error(s), 0 Warning(s).
+=======
 compiling Lora.c...
 ..\Src\radio\Lora.h(46): warning:  #1-D: last line of file ends without a newline
   void LoraUp_Poll();
@@ -52,6 +60,7 @@
 Program Size: Code=30116 RO-data=684 RW-data=692 ZI-data=7420  
 FromELF: creating hex file...
 "L051\L051.axf" - 0 Error(s), 9 Warning(s).
+>>>>>>> c8cbb8205d69b4120122a7d0923edcca611399ef
 
 <h2>Software Packages used:</h2>
 

--
Gitblit v1.9.3