diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-04-06 21:16:29 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-05-10 23:43:42 +0100 |
| commit | 30b0bd88a811753061d02945e95d0424229bc1a7 (patch) | |
| tree | c9cdb87cede1f5aa7335be35d99866899e2667fe | |
| parent | e2aed419f008dee26c4202d297b85be095de1691 (diff) | |
Fix mis-merge.
| -rw-r--r-- | src/lib/film.cc | 2 |
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 */ |