From 43963468a4bdecc04b19aafab323eb46c865e22c Mon Sep 17 00:00:00 2001
From: Jjie <1005539536@qq.com>
Date: Fri, 1 Aug 2025 09:50:13 +0800
Subject: [PATCH] no message

---
 NFine.Web/NFine.Web.csproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/NFine.Web/NFine.Web.csproj b/NFine.Web/NFine.Web.csproj
index 7ce7eee..ddda058 100644
--- a/NFine.Web/NFine.Web.csproj
+++ b/NFine.Web/NFine.Web.csproj
@@ -811,11 +811,11 @@
     <Content Include="Areas\PNSRM\Views\BicDoc_Publish\ICSBicDoc_Supplier.cshtml" />
     <Content Include="Areas\SRM\Views\PriceInquiry\VendorPersAddItem.cshtml" />
     <Content Include="Areas\SRM\Views\RCVList\Index.cshtml" />
-<<<<<<< HEAD
+
     <Content Include="Areas\PNSRM\Views\CreateItemLot\FormNew.cshtml" />
-=======
+
     <Content Include="Areas\PNSRM\Views\BicDoc_Publish\ICSBicDocByPO.cshtml" />
->>>>>>> ce3d82c9dfeecee1530f5da8bda239f52aca115e
+
     <None Include="Scripts\jquery-1.10.2.intellisense.js" />
     <Content Include="Scripts\jquery-1.10.2.js" />
     <Content Include="Scripts\jquery-1.10.2.min.js" />