Fix merge.
authorCarl Hetherington <cth@carlh.net>
Mon, 12 Oct 2015 10:25:53 +0000 (11:25 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 12 Oct 2015 10:25:53 +0000 (11:25 +0100)
commitbccc426dd0924bf6be63000835d7c86fd390ff59
tree8b2f40c41a0d931af8f5dc25198c7f483329d430
parent6bc2f68acc12f254d298a41dc9656306c3ae8c4f
Fix merge.
src/lib/writer.cc