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_IVT.s |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/system/startup_ldf/app_IVT.s b/system/startup_ldf/app_IVT.s
index d371cf9..4e514dc 100644
--- a/system/startup_ldf/app_IVT.s
+++ b/system/startup_ldf/app_IVT.s
@@ -1,8 +1,12 @@
 /*
+<<<<<<< HEAD
+** ADSP-21569 app_IVT.s generated on Sep 05, 2025 at 15:48:19
+=======
 ** ADSP-21569 app_IVT.s generated on Jul 24, 2025 at 14:17:29
+>>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
 */
 /*
-** Copyright (C) 2000-2022 Analog Devices Inc., All Rights Reserved.
+** Copyright (C) 2000-2023 Analog Devices Inc., All Rights Reserved.
 **
 ** This file is generated automatically based upon the options selected
 ** in the System Configuration utility. Changes to the Startup Code configuration

--
Gitblit v1.9.3