diff options
| author | Ulrich Germann <ugermann@inf.ed.ac.uk> | 2015-07-03 17:30:33 +0300 |
|---|---|---|
| committer | Ulrich Germann <ugermann@inf.ed.ac.uk> | 2015-07-03 17:30:33 +0300 |
| commit | 98c03dc04767bebd4db889ffdacede80bed6c108 (patch) | |
| tree | c1f31cc2e77dc85b245f9981254543dd3a25f564 /moses/IOWrapper.h | |
| parent | f78bb4a6e93297d56408e085b9311e1c23aa548c (diff) | |
| parent | 9dae3eb78520b7d574c8415a4fbebd84e37383bd (diff) | |
Merge branch 'mmt-dev' into ranked-sampling.
Conflicts:
moses/TranslationModel/UG/mm/ug_bitext.h
moses/TranslationModel/UG/mm/ug_bitext_jstats.cc
moses/TranslationModel/UG/mm/ug_bitext_jstats.h
moses/TranslationModel/UG/mm/ug_bitext_pstats.cc
moses/TranslationModel/UG/mm/ug_sampling_bias.cc
moses/TranslationModel/UG/mm/ug_sampling_bias.h
Diffstat (limited to 'moses/IOWrapper.h')
| -rw-r--r-- | moses/IOWrapper.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/moses/IOWrapper.h b/moses/IOWrapper.h index eb2deb729..d97023193 100644 --- a/moses/IOWrapper.h +++ b/moses/IOWrapper.h @@ -62,8 +62,6 @@ POSSIBILITY OF SUCH DAMAGE. #include "moses/ChartKBestExtractor.h" #include "moses/Syntax/KBestExtractor.h" -#include "search/applied.hh" - #include <boost/format.hpp> namespace Moses |