Merge branch 'master' of http://119.3.29.177:3000/lacy/PNSRM
# Conflicts:
# NFine.Application/bin/Debug/NFine.Application.dll
# NFine.Application/bin/Debug/NFine.Application.pdb
# NFine.Application/bin/Debug/NFine.Code.dll
# NFine.Application/bin/Debug/NFine.Code.pdb
# NFine.Application/bin/Debug/NFine.Data.dll
# NFine.Application/bin/Debug/NFine.Data.pdb
# NFine.Application/bin/Debug/NFine.Domain.dll
# NFine.Application/bin/Debug/NFine.Domain.pdb
# NFine.Application/bin/Debug/NFine.Repository.dll
# NFine.Application/bin/Debug/NFine.Repository.pdb
# NFine.Application/obj/Debug/NFine.Application.dll
# NFine.Application/obj/Debug/NFine.Application.pdb
# NFine.Code/bin/Debug/NFine.Code.dll
# NFine.Code/bin/Debug/NFine.Code.pdb
# NFine.Code/obj/Debug/NFine.Code.dll
# NFine.Code/obj/Debug/NFine.Code.pdb
# NFine.Data/bin/Debug/NFine.Code.dll
# NFine.Data/bin/Debug/NFine.Code.pdb
# NFine.Data/bin/Debug/NFine.Data.dll
# NFine.Data/bin/Debug/NFine.Data.pdb
# NFine.Data/obj/Debug/NFine.Data.dll
# NFine.Data/obj/Debug/NFine.Data.pdb
# NFine.Domain/bin/Debug/NFine.Code.dll
# NFine.Domain/bin/Debug/NFine.Code.pdb
# NFine.Domain/bin/Debug/NFine.Data.dll
# NFine.Domain/bin/Debug/NFine.Data.pdb
# NFine.Domain/bin/Debug/NFine.Domain.dll
# NFine.Domain/bin/Debug/NFine.Domain.pdb
# NFine.Domain/obj/Debug/NFine.Domain.dll
# NFine.Domain/obj/Debug/NFine.Domain.pdb
# NFine.Mapping/bin/Debug/NFine.Code.dll
# NFine.Mapping/bin/Debug/NFine.Code.pdb
# NFine.Mapping/bin/Debug/NFine.Data.dll
# NFine.Mapping/bin/Debug/NFine.Data.pdb
# NFine.Mapping/bin/Debug/NFine.Domain.dll
# NFine.Mapping/bin/Debug/NFine.Domain.pdb
# NFine.Mapping/bin/Debug/NFine.Mapping.dll
# NFine.Mapping/bin/Debug/NFine.Mapping.pdb
# NFine.Mapping/obj/Debug/NFine.Mapping.dll
# NFine.Mapping/obj/Debug/NFine.Mapping.pdb
# NFine.Repository/bin/Debug/NFine.Code.dll
# NFine.Repository/bin/Debug/NFine.Code.pdb
# NFine.Repository/bin/Debug/NFine.Data.dll
# NFine.Repository/bin/Debug/NFine.Data.pdb
# NFine.Repository/bin/Debug/NFine.Domain.dll
# NFine.Repository/bin/Debug/NFine.Domain.pdb
# NFine.Repository/bin/Debug/NFine.Repository.dll
# NFine.Repository/bin/Debug/NFine.Repository.pdb
# NFine.Repository/obj/Debug/NFine.Repository.dll
# NFine.Repository/obj/Debug/NFine.Repository.pdb
# NFine.Web/NFine.Web.csproj
# NFine.Web/bin/NFine.Application.dll
# NFine.Web/bin/NFine.Application.pdb
# NFine.Web/bin/NFine.Code.dll
# NFine.Web/bin/NFine.Code.pdb
# NFine.Web/bin/NFine.Data.dll
# NFine.Web/bin/NFine.Data.pdb
# NFine.Web/bin/NFine.Domain.dll
# NFine.Web/bin/NFine.Domain.pdb
# NFine.Web/bin/NFine.Mapping.dll
# NFine.Web/bin/NFine.Mapping.pdb
# NFine.Web/bin/NFine.Repository.dll
# NFine.Web/bin/NFine.Repository.pdb
# NFine.Web/bin/NFine.Web.dll
# NFine.Web/bin/NFine.Web.pdb
# NFine.Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
# NFine.Web/obj/Debug/NFine.Web.dll
# NFine.Web/obj/Debug/NFine.Web.pdb
|