From b99dcd21acd751df93d438e89f5d74219a4d728c Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 25 二月 2026 09:59:09 +0800
Subject: [PATCH] 1

---
 WebTM/WebTM.csproj |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index b006e73..cd93407 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -668,10 +668,7 @@
     <Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_CostProjectImport.html" />
     <Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_CostAccounting.html" />
     <Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_ItemMoneyBillImport.html" />
-<<<<<<< HEAD
-=======
     <Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_ItemMoneyBill_Excel.html" />
->>>>>>> 50ceb8be38852f1a32825a7d172bd9a4d4db241d
     <Content Include="views\鏉＄爜鏄庣粏\Kf_MateOutBillList_CodeDetail.html" />
     <Content Include="views\妗堜緥浠ｇ爜\鍗庤繙\HY_HistogramReport_ForPCSCheckNote.html" />
     <Content Include="views\妗堜緥浠ｇ爜\鍗庤繙\HY_HistogramReport.html" />

--
Gitblit v1.9.1