Fix mis-merge.
authorCarl Hetherington <cth@carlh.net>
Fri, 7 Apr 2017 23:42:01 +0000 (00:42 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 19 Apr 2017 22:04:32 +0000 (23:04 +0100)
commit71b42c48087a4f05f55166e328d1bea3b2b2228b
treeb55a56ba79e7124dc8c269080173aa1e08a306e4
parent90c447e9200b9eef0f542b21fab1d0d9eebab733
Fix mis-merge.
src/lib/config.cc
src/lib/config.h