From 30b0bd88a811753061d02945e95d0424229bc1a7 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 6 Apr 2019 21:16:29 +0100
Subject: [PATCH] Fix mis-merge.

---
 src/lib/film.cc | 2 --
 1 file changed, 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 */
-- 
2.30.2