Merge pull request #21687 from batrick/i23638

author Yan, Zheng <ukernel@gmail.com>

Sat, 2 Jun 2018 00:13:38 +0000 (08:13 +0800)

committer GitHub <noreply@github.com>

Sat, 2 Jun 2018 00:13:38 +0000 (08:13 +0800)
author Yan, Zheng <ukernel@gmail.com>
Sat, 2 Jun 2018 00:13:38 +0000 (08:13 +0800)
committer GitHub <noreply@github.com>
Sat, 2 Jun 2018 00:13:38 +0000 (08:13 +0800)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/client/Client.h
Simple merge
diff --cc src/client/UserPerm.h
Simple merge
author	Yan, Zheng <ukernel@gmail.com>
	Sat, 2 Jun 2018 00:13:38 +0000 (08:13 +0800)
committer	GitHub <noreply@github.com>
	Sat, 2 Jun 2018 00:13:38 +0000 (08:13 +0800)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/Client.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/UserPerm.h	patch \|	diff1 \|	diff2 \|	blob \| history