From fbb8392d06677c8eccabe03ecf3feddd349175ce Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期一, 17 十月 2022 02:15:38 +0800
Subject: [PATCH] sovle conflict

---
 MDK-ARM/JLinkLog.txt |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MDK-ARM/JLinkLog.txt b/MDK-ARM/JLinkLog.txt
index 05fac1c..971e19e 100644
--- a/MDK-ARM/JLinkLog.txt
+++ b/MDK-ARM/JLinkLog.txt
@@ -3,10 +3,10 @@
 T16E8 000:156 DLL Compiled: Oct 25 2016 19:31:51 (0002ms, 0029ms total)
 T16E8 000:156 Logging started @ 2022-10-15 09:00 (0002ms, 0029ms total)
 T16E8 000:158 JLINK_SetWarnOutHandler(...) (0000ms, 0029ms total)
-T16E8 000:158 JLINK_OpenEx(...)
-Firmware: J-Link ARM-OB STM32 compiled Aug 22 2012 19:52:04
-Hardware: V7.00
-S/N: 20090928
+T16E8 000:158 JLINK_OpenEx(...)
+Firmware: J-Link ARM-OB STM32 compiled Aug 22 2012 19:52:04
+Hardware: V7.00
+S/N: 20090928
 Feature(s): RDI,FlashDL,FlashBP,JFlash,GDBFullWEBSRV Webserver running on local port 19080 (0018ms, 0047ms total)
 T16E8 000:158   returns O.K. (0018ms, 0047ms total)
 T16E8 000:176 JLINK_SetErrorOutHandler(...) (0000ms, 0047ms total)

--
Gitblit v1.9.1