From 30e5b0575b30d1fefa367b9f27d2030e757875c1 Mon Sep 17 00:00:00 2001 From: Hieu Hoang Date: Mon, 3 Sep 2012 19:12:00 +0100 Subject: [PATCH 1/2] merge conflict --- scripts/generic/extract-parallel.perl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/generic/extract-parallel.perl b/scripts/generic/extract-parallel.perl index 805214542..9b94f08e6 100755 --- a/scripts/generic/extract-parallel.perl +++ b/scripts/generic/extract-parallel.perl @@ -91,14 +91,8 @@ for (my $i = 0; $i < $numParallel; ++$i) if ($pid == 0) { # child my $numStr = NumStr($i); -<<<<<<< HEAD - my $cmd = "$extractCmd $TMPDIR/target.$numStr $TMPDIR/source.$numStr $TMPDIR/align.$numStr $TMPDIR/extract.$numStr $otherExtractArgs"; - $cmd .= " --SentenceOffset ".($i*$linesPerSplit); - print STDERR $cmd."\n"; -======= my $cmd = "$extractCmd $TMPDIR/target.$numStr $TMPDIR/source.$numStr $TMPDIR/align.$numStr $TMPDIR/extract.$numStr $otherExtractArgs 2>> /dev/stderr \n"; print STDERR $cmd; ->>>>>>> b317522563feb4ca7ff978a0de661ec2189934ea `$cmd`; exit(); From 71b64040914999923fc4af51ae23c4a4f791b9ed Mon Sep 17 00:00:00 2001 From: Hieu Hoang Date: Tue, 4 Sep 2012 10:28:19 +0100 Subject: [PATCH 2/2] eclipse --- contrib/other-builds/OnDiskPt/.cproject | 6 +++--- contrib/other-builds/moses/.cproject | 16 +++++----------- contrib/other-builds/util/.cproject | 4 ++-- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/contrib/other-builds/OnDiskPt/.cproject b/contrib/other-builds/OnDiskPt/.cproject index 864e482c6..472888f48 100644 --- a/contrib/other-builds/OnDiskPt/.cproject +++ b/contrib/other-builds/OnDiskPt/.cproject @@ -41,11 +41,11 @@ - diff --git a/contrib/other-builds/moses/.cproject b/contrib/other-builds/moses/.cproject index 9927bcb73..0148cc6f2 100644 --- a/contrib/other-builds/moses/.cproject +++ b/contrib/other-builds/moses/.cproject @@ -31,6 +31,7 @@