回答的回复
Merge remote-tracking branch 'origin/master'

Conflicts:
	KnowIsKnow/KnowIsKnow/KnowIsKnow.csproj
Merge branch 'master' of https://github.com/FirstFactor/knowisknow