From a9312568cde771d4b970445e1f66a04fabb64d56 Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期三, 01 二月 2023 14:07:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Radio' into dev1

---
 .gitignore |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7ed7245..0297066 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 Thumbs.db
+MDK-ARM/JLinkLog.txt
 *.TMP
 *.lst
 *.o
@@ -18,4 +19,3 @@
 *.uvgui.*
 *.uvoptx
 JLinkLog.txt
-

--
Gitblit v1.9.1