diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-11 16:52:14 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-11 16:52:14 +0000 |
| commit | 33085e3c0c7257d818339e361ea4f7669ae24ca9 (patch) | |
| tree | f31286d8a6f4aa990fce2af549e5eb3cb7909b34 /src/lib/subtitle_content.h | |
| parent | 5d117c316fe68686885a931bf028cbd8afa5c0e1 (diff) | |
Fix another cocked up merge.
Diffstat (limited to 'src/lib/subtitle_content.h')
| -rw-r--r-- | src/lib/subtitle_content.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/lib/subtitle_content.h b/src/lib/subtitle_content.h index e74164f77..4cbef657a 100644 --- a/src/lib/subtitle_content.h +++ b/src/lib/subtitle_content.h @@ -108,8 +108,6 @@ private: double _subtitle_x_scale; /** y scale factor to apply to subtitles */ double _subtitle_y_scale; - - boost::optional<std::string> _subtitle_language; }; #endif |