diff options
author | Ulrich Germann <Ulrich.Germann@gmail.com> | 2015-11-01 18:37:36 +0300 |
---|---|---|
committer | Ulrich Germann <Ulrich.Germann@gmail.com> | 2015-11-01 18:37:36 +0300 |
commit | 8424fb6e2ad8e9d15471c7e610bce85082610a41 (patch) | |
tree | 9f556ce7af7d1807de083471c14166ef046f26a1 /moses/TranslationTask.cpp | |
parent | e9b1c6019ba6ebce3bb4e090a1a6877b1c3d0e18 (diff) | |
parent | edd1b6a089d3b075e1baff13c17956944cc70bdd (diff) |
Merge branch 'master' of https://github.com/moses-smt/mosesdecoder
Conflicts:
moses/LM/IRST.cpp
Diffstat (limited to 'moses/TranslationTask.cpp')
-rw-r--r-- | moses/TranslationTask.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/moses/TranslationTask.cpp b/moses/TranslationTask.cpp index 5eab55c82..95035ae9c 100644 --- a/moses/TranslationTask.cpp +++ b/moses/TranslationTask.cpp @@ -167,7 +167,7 @@ interpret_dlt() m_scope->SetContextWeights(j->second); } } - + void TranslationTask::Run() { |