diff options
| author | Nicola Bertoldi <bertoldi@fbk.eu> | 2014-12-13 14:52:47 +0300 |
|---|---|---|
| committer | Nicola Bertoldi <bertoldi@fbk.eu> | 2014-12-13 14:52:47 +0300 |
| commit | e4eb201c52be74fee74399a6f35fcbe8eb85d834 (patch) | |
| tree | 7792ef96d63262f6e28f1857741e1162c7dccbc4 /phrase-extract/PhraseExtractionOptions.h | |
| parent | cea2d9d8bb34a81660974cae20d66aefec4e0468 (diff) | |
| parent | a0b6b6a341e74b47bbef4652ad7fd928cf91e17c (diff) | |
merged master into dynamic-models and solved conflicts
Diffstat (limited to 'phrase-extract/PhraseExtractionOptions.h')
| -rw-r--r-- | phrase-extract/PhraseExtractionOptions.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/phrase-extract/PhraseExtractionOptions.h b/phrase-extract/PhraseExtractionOptions.h index ac22f333a..14d1575e1 100644 --- a/phrase-extract/PhraseExtractionOptions.h +++ b/phrase-extract/PhraseExtractionOptions.h @@ -18,7 +18,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ***********************************************************************/ -/* Created by Rohit Gupta, CDAC, Mumbai, India on 18 July, 2012*/ #include <string> #include <vector> |