From b20cee9a3445b3ea3c4f0a1aafec0ba202dc77b5 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期四, 12 六月 2025 14:00:43 +0800
Subject: [PATCH] 修改合并错误

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

diff --git a/.gitignore b/.gitignore
index c884075..dff78cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,6 @@
 /sdk_v0.6.2_r4/boards/mk8000_evk/uwb_examples/bin_files/*.bin
 /sdk_v0.6.2_r4/boards/mk8000_evk/driver_examples/adc/keil/Objects/*.o
 /sdk_v0.6.2_r4/boards/mk8000_evk/uwb_examples/ranging_custom/keil/*.uvmpw
+/keil/include/drivers/*.orig
+/boards/mk8000_evk/driver_examples/power_cycling/keil/Objects/*.o
+/keil/*.orig

--
Gitblit v1.9.3