1

NFine.Web/NFine.Web.csproj

@@ -811,11 +811,8 @@
     <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" />