GitHub PushEvent at 2014-10-21 00:35:19
Repository: knowisknow
Actor: hytcquanjunyi
Payload: {"shas":[["e233da8704795d791bb5431eb3720b5457b3bcac","37aa69c7ba9ae0653ca8906e204ffcb4393707b7@qq.com","添加了QuestionUserView的三层内容","hytcquanjunyi",true],["b7d8272d3be7f6666efd77848236ca747ee72d13","37aa69c7ba9ae0653ca8906e204ffcb4393707b7@qq.com","Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tKnowIsKnow/BLL/bin/Debug/BLL.dll\n\tKnowIsKnow/BLL/bin/Debug/BLL.pdb\n\tKnowIsKnow/BLL/bin/Debug/DAL.dll\n\tKnowIsKnow/BLL/bin/Debug/DAL.pdb\n\tKnowIsKnow/BLL/obj/Debug/BLL.csprojResolveAssemblyReference.cache\n\tKnowIsKnow/BLL/obj/Debug/BLL.dll\n\tKnowIsKnow/BLL/obj/Debug/BLL.pdb\n\tKnowIsKnow/BLL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache\n\tKnowIsKnow/DAL/bin/Debug/DAL.dll\n\tKnowIsKnow/DAL/bin/Debug/DAL.pdb\n\tKnowIsKnow/DAL/obj/Debug/DAL.csprojResolveAssemblyReference.cache\n\tKnowIsKnow/DAL/obj/Debug/DAL.dll\n\tKnowIsKnow/DAL/obj/Debug/DAL.pdb\n\tKnowIsKnow/DAL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache\n\n\tKnowIsKnow/DBUtility/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache\n\tKnowIsKnow/KnowIsKnow.v12.suo\n\tKnowIsKnow/KnowIsKnow/bin/BLL.dll\n\tKnowIsKnow/KnowIsKnow/bin/BLL.pdb\n\tKnowIsKnow/KnowIsKnow/bin/DAL.dll\n\tKnowIsKnow/KnowIsKnow/bin/DAL.pdb\n\tKnowIsKnow/KnowIsKnow/bin/KnowIsKnow.dll\n\tKnowIsKnow/KnowIsKnow/bin/KnowIsKnow.pdb\n\n\tKnowIsKnow/KnowIsKnow/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache\n\n\tKnowIsKnow/KnowIsKnow/obj/Debug/KnowIsKnow.csprojResolveAssemblyReference.cache\n\tKnowIsKnow/KnowIsKnow/obj/Debug/KnowIsKnow.dll\n\tKnowIsKnow/KnowIsKnow/obj/Debug/KnowIsKnow.pdb\n\n\tKnowIsKnow/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache","hytcquanjunyi",true]],"size":2,"ref":"refs/heads/master","head":"b7d8272d3be7f6666efd77848236ca747ee72d13"}