From dbfcb01d2199bb80d8b4b88076c32bb6d71d25d9 Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Thu, 20 May 2021 10:28:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4conflist=E7=9A=84app=5Fmaster?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tsg-9140-scripts/roles/sapp/templates/conflist.inf.j2 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tsg-9140-scripts/roles/sapp/templates/conflist.inf.j2 b/tsg-9140-scripts/roles/sapp/templates/conflist.inf.j2
index c507b091..701fdb9a 100644
--- a/tsg-9140-scripts/roles/sapp/templates/conflist.inf.j2
+++ b/tsg-9140-scripts/roles/sapp/templates/conflist.inf.j2
@@ -1,7 +1,6 @@
 [platform]
 ./plug/platform/app_proto_identify/app_proto_identify.inf
 ./plug/platform/tsg_master/tsg_master.inf
-./plug/platform/app_master/app_master.inf
 
 [protocol]
 ./plug/protocol/mesa_sip/mesa_sip.inf