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

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

diff --git a/.gitignore b/.gitignore
index c9355c1..1b5dba2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,20 @@
 Thumbs.db
 *.TMP
-MDK-ARM/F030C8T6_Test2/*
+*.lst
+*.o
+*.d
+*.crf
+*.lnp
+*.axf
+*.htm
+*.build_log.htm
+*.dep
+*.iex
+*.iex
+*.bin
 
+MDK-ARM/F030C8T6_Test2/*
+*.uvguix.*
+*.uvgui.*
+*.uvoptx
+JLinkLog.txt

--
Gitblit v1.9.1