Merge branch 'master' of http://119.3.29.177:3000/lacy/PNSRM

# Conflicts: # NFine.Web/NFine.Web.csproj
2 days ago · 4e5f821e05
4 changed files with 4 additions and 0 deletions
--- a/.vs/NFine.Framework/v17/.suo
+++ b/.vs/NFine.Framework/v17/.suo
--- a/NFine.Web/NFine.Web.csproj
+++ b/NFine.Web/NFine.Web.csproj
@ -812,10 +812,14 @@
    <Content Include="Areas\SRM\Views\PriceInquiry\VendorPersAddItem.cshtml" />
    <Content Include="Areas\SRM\Views\RCVList\Index.cshtml" />

+
    <Content Include="Areas\PNSRM\Views\CreateItemLot\FormNew.cshtml" />

    <Content Include="Areas\PNSRM\Views\BicDoc_Publish\ICSBicDocByPO.cshtml" />

+    <Content Include="Areas\PNSRM\Views\CreateItemLot\FormNew.cshtml" />
+    <Content Include="Areas\PNSRM\Views\BicDoc_Publish\ICSBicDocByPO.cshtml" />
+
    <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" />
--- a/NFine.Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/NFine.Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
--- a/NFine.Web/obj/Debug/NFine.Web.csproj.AssemblyReference.cache
+++ b/NFine.Web/obj/Debug/NFine.Web.csproj.AssemblyReference.cache