From: Carl Hetherington Date: Mon, 29 Nov 2021 07:13:08 +0000 (+0100) Subject: Fix mis-merge. X-Git-Tag: v2.15.178~1 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=bb3602364ff65a7bc10e5c81e5ba11ded1eeb5b0 Fix mis-merge. --- diff --git a/src/lib/check_content_change_job.cc b/src/lib/check_content_change_job.cc index 500e03c1d..e755a3945 100644 --- a/src/lib/check_content_change_job.cc +++ b/src/lib/check_content_change_job.cc @@ -27,10 +27,10 @@ #include "i18n.h" -using std::string; -using std::list; using std::cout; +using std::make_shared; using std::shared_ptr; +using std::string; CheckContentChangeJob::CheckContentChangeJob (shared_ptr film) : Job (film)