From 33085e3c0c7257d818339e361ea4f7669ae24ca9 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 11 Dec 2014 16:52:14 +0000
Subject: [PATCH] Fix another cocked up merge.

---
 src/lib/subtitle_content.cc | 6 ------
 src/lib/subtitle_content.h  | 2 --
 2 files changed, 8 deletions(-)

diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc
index f10fa58b2..df90a4a1a 100644
--- a/src/lib/subtitle_content.cc
+++ b/src/lib/subtitle_content.cc
@@ -139,13 +139,7 @@ SubtitleContent::as_xml (xmlpp::Node* root) const
 	root->add_child("SubtitleYOffset")->add_child_text (raw_convert<string> (_subtitle_y_offset));
 	root->add_child("SubtitleXScale")->add_child_text (raw_convert<string> (_subtitle_x_scale));
 	root->add_child("SubtitleYScale")->add_child_text (raw_convert<string> (_subtitle_y_scale));
-<<<<<<< HEAD
-	if (_subtitle_language) {
-		root->add_child("SubtitleLanguage")->add_child_text (_subtitle_language.get ());
-	}
-=======
 	root->add_child("SubtitleLanguage")->add_child_text (_subtitle_language);
->>>>>>> 30a2bb95980d74a33baeb18d18f2e4ac72d66845
 }
 
 void
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
-- 
2.30.2