summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-04-06 21:16:29 +0100
committerCarl Hetherington <cth@carlh.net>2019-05-08 23:25:22 +0100
commitfa1325c0ab2511109f1407037c2352192965eb0b (patch)
tree3eaf007c5063ec39f64a529f1f41cebbf2f8c2fa
parent669904072c2dc5af6e6fb56dbdc1288eb9806357 (diff)
Fix mis-merge.
-rw-r--r--src/lib/film.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 0b9e57117..aaa2627e1 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -547,8 +547,6 @@ Film::read_metadata (optional<boost::filesystem::path> path)
_ratings.push_back (dcp::Rating(i));
}
- list<string> notes;
- /* This method is the only one that can return notes (so far) */
_playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"), _state_version, notes);
/* Write backtraces to this film's directory, until another film is loaded */