Fix mis-merge.

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 6df0373167a58a9ec3252d24e169897e697b1210..77e566124322c9e0a311bff1000ccf88b085beff 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -553,8 +553,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 */