From b6290b94cac76a5634cd90b495b65d91ee92d85e Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期三, 22 二月 2023 08:57:38 +0800
Subject: [PATCH] fix conflict

---
 MDK-ARM/.vscode/keil-assistant.log |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/MDK-ARM/.vscode/keil-assistant.log b/MDK-ARM/.vscode/keil-assistant.log
new file mode 100644
index 0000000..a56fa0a
--- /dev/null
+++ b/MDK-ARM/.vscode/keil-assistant.log
@@ -0,0 +1,2 @@
+[info] Log at : 2022/10/21|09:22:30|GMT+0800
+

--
Gitblit v1.9.1