22 files changed, 0 insertions, 14 deletions
diff --git a/tests/delete-me/phrase.multiple-translation-system-lr/filter-stderr.pl b/defer/phrase.interpolated/filter-stderr.pl
index 2f6e176..2f6e176 100755
--- a/tests/delete-me/phrase.multiple-translation-system-lr/filter-stderr.pl
+++ b/defer/phrase.interpolated/filter-stderr.pl
diff --git a/tests/delete-me/phrase.multiple-translation-system-lr/filter-stdout.pl b/defer/phrase.interpolated/filter-stdout.pl
index 476ddf6..476ddf6 100755
--- a/tests/delete-me/phrase.multiple-translation-system-lr/filter-stdout.pl
+++ b/defer/phrase.interpolated/filter-stdout.pl
diff --git a/tests/phrase.interpolated/moses.ini b/defer/phrase.interpolated/moses.ini
index d9ebd45..d9ebd45 100644
--- a/tests/phrase.interpolated/moses.ini
+++ b/defer/phrase.interpolated/moses.ini
diff --git a/tests/phrase.interpolated/to-translate.txt b/defer/phrase.interpolated/to-translate.txt
index 1b4b9f3..1b4b9f3 100644
--- a/tests/phrase.interpolated/to-translate.txt
+++ b/defer/phrase.interpolated/to-translate.txt
diff --git a/tests/phrase.interpolated/truth/results.txt b/defer/phrase.interpolated/truth/results.txt
index a14fe87..a14fe87 100644
--- a/tests/phrase.interpolated/truth/results.txt
+++ b/defer/phrase.interpolated/truth/results.txt
diff --git a/tests/delete-me/phrase.multiple-translation-system/filter-stderr.pl b/defer/phrase.multiple-translation-system-lr/filter-stderr.pl
index 2f6e176..2f6e176 100755
--- a/tests/delete-me/phrase.multiple-translation-system/filter-stderr.pl
+++ b/defer/phrase.multiple-translation-system-lr/filter-stderr.pl
diff --git a/tests/delete-me/phrase.multiple-translation-system/filter-stdout.pl b/defer/phrase.multiple-translation-system-lr/filter-stdout.pl
index 476ddf6..476ddf6 100755
--- a/tests/delete-me/phrase.multiple-translation-system/filter-stdout.pl
+++ b/defer/phrase.multiple-translation-system-lr/filter-stdout.pl
diff --git a/tests/delete-me/phrase.multiple-translation-system-lr/moses.ini b/defer/phrase.multiple-translation-system-lr/moses.ini
index 0ea29c8..0ea29c8 100644
--- a/tests/delete-me/phrase.multiple-translation-system-lr/moses.ini
+++ b/defer/phrase.multiple-translation-system-lr/moses.ini
diff --git a/tests/delete-me/phrase.multiple-translation-system-lr/to-translate.txt b/defer/phrase.multiple-translation-system-lr/to-translate.txt
index d336d82..d336d82 100644
--- a/tests/delete-me/phrase.multiple-translation-system-lr/to-translate.txt
+++ b/defer/phrase.multiple-translation-system-lr/to-translate.txt
diff --git a/tests/delete-me/phrase.multiple-translation-system-lr/truth/results.txt b/defer/phrase.multiple-translation-system-lr/truth/results.txt
index 79c98ba..79c98ba 100644
--- a/tests/delete-me/phrase.multiple-translation-system-lr/truth/results.txt
+++ b/defer/phrase.multiple-translation-system-lr/truth/results.txt
diff --git a/tests/phrase.interpolated/filter-stderr.pl b/defer/phrase.multiple-translation-system/filter-stderr.pl
index 2f6e176..2f6e176 100755
--- a/tests/phrase.interpolated/filter-stderr.pl
+++ b/defer/phrase.multiple-translation-system/filter-stderr.pl
diff --git a/tests/phrase.interpolated/filter-stdout.pl b/defer/phrase.multiple-translation-system/filter-stdout.pl
index 476ddf6..476ddf6 100755
--- a/tests/phrase.interpolated/filter-stdout.pl
+++ b/defer/phrase.multiple-translation-system/filter-stdout.pl
diff --git a/tests/delete-me/phrase.multiple-translation-system/moses.ini b/defer/phrase.multiple-translation-system/moses.ini
index c7fc8a8..c7fc8a8 100644
--- a/tests/delete-me/phrase.multiple-translation-system/moses.ini
+++ b/defer/phrase.multiple-translation-system/moses.ini
diff --git a/tests/delete-me/phrase.multiple-translation-system/to-translate.txt b/defer/phrase.multiple-translation-system/to-translate.txt
index a505702..a505702 100644
--- a/tests/delete-me/phrase.multiple-translation-system/to-translate.txt
+++ b/defer/phrase.multiple-translation-system/to-translate.txt
diff --git a/tests/delete-me/phrase.multiple-translation-system/truth/results.txt b/defer/phrase.multiple-translation-system/truth/results.txt
index d15f400..d15f400 100644
--- a/tests/delete-me/phrase.multiple-translation-system/truth/results.txt
+++ b/defer/phrase.multiple-translation-system/truth/results.txt
diff --git a/tests/phrase.word-translation/filter-stderr.pl b/defer/phrase.word-translation/filter-stderr.pl
index 2f6e176..2f6e176 100755
--- a/tests/phrase.word-translation/filter-stderr.pl
+++ b/defer/phrase.word-translation/filter-stderr.pl
diff --git a/tests/phrase.word-translation/filter-stdout.pl b/defer/phrase.word-translation/filter-stdout.pl
index 476ddf6..476ddf6 100755
--- a/tests/phrase.word-translation/filter-stdout.pl
+++ b/defer/phrase.word-translation/filter-stdout.pl
diff --git a/tests/phrase.word-translation/moses.ini b/defer/phrase.word-translation/moses.ini
index 3cdb881..3cdb881 100644
--- a/tests/phrase.word-translation/moses.ini
+++ b/defer/phrase.word-translation/moses.ini
diff --git a/tests/phrase.word-translation/to-translate.txt b/defer/phrase.word-translation/to-translate.txt
index 9e59361..9e59361 100644
--- a/tests/phrase.word-translation/to-translate.txt
+++ b/defer/phrase.word-translation/to-translate.txt
diff --git a/tests/phrase.word-translation/truth/results.txt b/defer/phrase.word-translation/truth/results.txt
index 28f97ea..28f97ea 100644
--- a/tests/phrase.word-translation/truth/results.txt
+++ b/defer/phrase.word-translation/truth/results.txt
diff --git a/tests/phrase.word-translation/weights b/defer/phrase.word-translation/weights
index 168d6d2..168d6d2 100644
--- a/tests/phrase.word-translation/weights
+++ b/defer/phrase.word-translation/weights
diff --git a/tests/misc.extract-parallel-weighted/run.perl b/tests/misc.extract-parallel-weighted/run.perl
index c6a1ed0..566a02f 100755
--- a/tests/misc.extract-parallel-weighted/run.perl
+++ b/tests/misc.extract-parallel-weighted/run.perl
@@ -17,16 +17,6 @@ GetOptions("moses-root=s" => \$mosesRoot,
            "results-dir=s"=> \$results_dir,
           ) or exit 1;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-my $cmd;
-$cmd = "$mosesRoot/scripts/generic/extract-parallel.perl 2 $splitCmd $sortCmd $mosesBin/extract $test_dir/$test_name/en $test_dir/$test_name/fr $test_dir/$test_name/align.fr-en $results_dir/extract 7 --GZOutput --InstanceWeights $test_dir/$test_name/weights 2> $results_dir/log";
-print STDERR "Executing: $cmd\n";
-`$cmd`;
-system("$catCmd $results_dir/extract.sorted.gz $results_dir/extract.inv.sorted.gz > $results_dir/out");
-=======
-=======
->>>>>>> 47addea26d2effd79843275644e2d287aa282266
 my $SPLIT_EXEC = `gsplit --help 2>/dev/null`; 
 if($SPLIT_EXEC) {
   $SPLIT_EXEC = 'gsplit';
@@ -51,9 +41,5 @@ print STDERR "Executing: $cmd\n";
 `$cmd`;
 
 system("$CAT_EXEC $results_dir/extract.sorted.gz $results_dir/extract.inv.sorted.gz > $results_dir/out");
-<<<<<<< HEAD
->>>>>>> 475688bf6e70934b733b1e3ffb711f997c993ba3
-=======
->>>>>>> 47addea26d2effd79843275644e2d287aa282266