Fix another cocked up merge.
authorCarl Hetherington <cth@carlh.net>
Thu, 11 Dec 2014 16:52:14 +0000 (16:52 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 11 Dec 2014 16:52:14 +0000 (16:52 +0000)
commit33085e3c0c7257d818339e361ea4f7669ae24ca9
treef31286d8a6f4aa990fce2af549e5eb3cb7909b34
parent5d117c316fe68686885a931bf028cbd8afa5c0e1
Fix another cocked up merge.
src/lib/subtitle_content.cc
src/lib/subtitle_content.h