From e0f29d5815a7dd4d45733ce1d661f1df263913d4 Mon Sep 17 00:00:00 2001
From: chenlh <2008get@163.com>
Date: 星期四, 09 十月 2025 15:23:10 +0800
Subject: [PATCH] 第一轮测试OK版提交

---
 system/startup_ldf/app_heaptab.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/system/startup_ldf/app_heaptab.c b/system/startup_ldf/app_heaptab.c
index 57e0445..ca82829 100644
--- a/system/startup_ldf/app_heaptab.c
+++ b/system/startup_ldf/app_heaptab.c
@@ -1,5 +1,9 @@
 /*
+<<<<<<< HEAD
 ** ADSP-21569 user heap source file generated on Sep 05, 2025 at 15:48:19.
+=======
+** ADSP-21569 user heap source file generated on Jul 24, 2025 at 14:17:30.
+>>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
 */
 /*
 ** Copyright (C) 2000-2023 Analog Devices Inc., All Rights Reserved.

--
Gitblit v1.9.3