Fix mis-merge.

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 4376ff0575c7e4faaa82284301343a34ab550f9a..af0853bed451f65e82c02ff3bf295be90861601e 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -309,11 +309,8 @@ try
        _kdm_filename_format = dcp::NameFormat (f.optional_string_child("KDMFilenameFormat").get_value_or ("KDM %f %c %s"));
        _dcp_metadata_filename_format = dcp::NameFormat (f.optional_string_child("DCPMetadataFilenameFormat").get_value_or ("%t"));
        _dcp_asset_filename_format = dcp::NameFormat (f.optional_string_child("DCPAssetFilenameFormat").get_value_or ("%t"));
-<<<<<<< 8de6a5d1d054bab25ab0d86bc48442d9d6adb849
        _jump_to_selected = f.optional_bool_child("JumpToSelected").get_value_or (true);
-=======
        _sound_output = f.optional_string_child("SoundOutput");
->>>>>>> First bits of audio support.
 
        /* Replace any cinemas from config.xml with those from the configured file */
        if (boost::filesystem::exists (_cinemas_file)) {

diff --git a/src/lib/config.h b/src/lib/config.h
index abfdba3dd56cd2347022a7aaf4d47e12acfcbecb..2fd36059a6b9326ffe84b9ed7825829288ad6600 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -698,12 +698,9 @@ private:
        dcp::NameFormat _kdm_container_name_format;
        dcp::NameFormat _dcp_metadata_filename_format;
        dcp::NameFormat _dcp_asset_filename_format;
-<<<<<<< 8de6a5d1d054bab25ab0d86bc48442d9d6adb849
        bool _jump_to_selected;
-=======
        /** name of a specific sound output stream to use for preview */
        boost::optional<std::string> _sound_output;
->>>>>>> First bits of audio support.
 
        /** Singleton instance, or 0 */
        static Config* _instance;