From 1fb11836b91977a949bef5eae807d57b13fe9bf8 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 3 Oct 2016 09:14:58 +0100
Subject: Fix various bad automatic merges in i18n files.

---
 src/wx/wscript | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/wx/wscript')

diff --git a/src/wx/wscript b/src/wx/wscript
index e001c51b7..fd1528b27 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -31,6 +31,7 @@ sources = """
           audio_mapping_view.cc
           audio_panel.cc
           audio_plot.cc
+          batch_job_view.cc
           cinema_dialog.cc
           colour_conversion_editor.cc
           config_dialog.cc
@@ -71,6 +72,7 @@ sources = """
           move_to_dialog.cc
           name_format_editor.cc
           new_film_dialog.cc
+          normal_job_view.cc
           playhead_to_timecode_dialog.cc
           playhead_to_frame_dialog.cc
           repeat_dialog.cc
-- 
cgit v1.2.3