Merge branch 'master' of http://202.166.220.79:3000/JME-JAPAN/AgentSystem
# Conflicts:
# .gitignore
# Business/bin/Debug/Business.dll
# Business/bin/Debug/Business.pdb
# Business/bin/Debug/Common.dll
# Business/bin/Debug/Common.pdb
# Business/bin/Debug/Repository.dll
# Business/bin/Debug/Repository.pdb
# Business/obj/Debug/Business.csproj.CoreCompileInputs.cache
# Business/obj/Debug/Business.csproj.FileListAbsolute.txt
# Business/obj/Debug/Business.dll
# Business/obj/Debug/Business.pdb
# Common/bin/Debug/Common.dll
# Common/bin/Debug/Common.pdb
# Common/obj/Debug/Common.csproj.CoreCompileInputs.cache
# Common/obj/Debug/Common.csproj.FileListAbsolute.txt
# Common/obj/Debug/Common.dll
# Common/obj/Debug/Common.pdb
# Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
# JMEAgentSystem/JMEAgentSystem.csproj.user
# JMEAgentSystem/bin/Business.dll
# JMEAgentSystem/bin/Business.pdb
# JMEAgentSystem/bin/Common.dll
# JMEAgentSystem/bin/Common.pdb
# JMEAgentSystem/bin/JMEAgentSystem.dll
# JMEAgentSystem/bin/JMEAgentSystem.pdb
# JMEAgentSystem/bin/Repository.dll
# JMEAgentSystem/bin/Repository.pdb
# JMEAgentSystem/bin/WebGrease.dll
# JMEAgentSystem/obj/Debug/DesignTimeResolveAssemblyReferences.cache
# JMEAgentSystem/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
# JMEAgentSystem/obj/Debug/JMEAgentSystem.csproj.CoreCompileInputs.cache
# JMEAgentSystem/obj/Debug/JMEAgentSystem.csproj.FileListAbsolute.txt
# JMEAgentSystem/obj/Debug/JMEAgentSystem.dll
# JMEAgentSystem/obj/Debug/JMEAgentSystem.pdb
# Repository/bin/Debug/Common.dll
# Repository/bin/Debug/Common.pdb
# Repository/bin/Debug/Repository.dll
# Repository/bin/Debug/Repository.pdb
# Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
# Repository/obj/Debug/Repository.csproj.CoreCompileInputs.cache
# Repository/obj/Debug/Repository.csproj.FileListAbsolute.txt
# Repository/obj/Debug/Repository.dll
# Repository/obj/Debug/Repository.pdb
|