From fe4d335b54ede7a47fd4bcf5c228fb427cbcc8c9 Mon Sep 17 00:00:00 2001
From: chenlh <2008get@163.com>
Date: 星期二, 20 一月 2026 14:46:01 +0800
Subject: [PATCH] 新增通道参数拷贝功能

---
 system/startup_ldf/app_startup.s |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/system/startup_ldf/app_startup.s b/system/startup_ldf/app_startup.s
index f75894b..eea8d42 100644
--- a/system/startup_ldf/app_startup.s
+++ b/system/startup_ldf/app_startup.s
@@ -1,9 +1,5 @@
 /*
-<<<<<<< HEAD
-** ADSP-21569 startup code generated on Sep 05, 2025 at 15:48:19.
-=======
-** ADSP-21569 startup code generated on Jul 24, 2025 at 14:17:29.
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
+** ADSP-21569 startup code generated on Oct 28, 2025 at 17:44:48.
 */
 /*
 ** Copyright (C) 2000-2023 Analog Devices Inc., All Rights Reserved.

--
Gitblit v1.9.3