This is an automated email from the ASF dual-hosted git repository.

sergeykamov pushed a commit to branch NLPCRAFT-261
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git

commit 8a3fcbde28a123274ad2b7d78ebcd892eeadbdae
Merge: 854700c c999e3c
Author: Sergey Kamov <[email protected]>
AuthorDate: Mon Mar 8 15:25:22 2021 +0300

    Merge branch 'master' into NLPCRAFT-261
    
    # Conflicts:
    #   
nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala

 .../org/apache/nlpcraft/model/tools/cmdline/NCCli.scala | 17 ++++++++++-------
 .../mgrs/nlp/enrichers/model/NCModelEnricher.scala      |  1 +
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --cc 
nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala
index 82edf69,2a9dec0..13b7d45
--- 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala
+++ 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCModelEnricher.scala
@@@ -24,8 -24,7 +24,9 @@@ import org.apache.nlpcraft.model.
  import 
org.apache.nlpcraft.probe.mgrs.NCProbeSynonymChunkKind.{NCSynonymChunkKind, 
TEXT}
  import org.apache.nlpcraft.probe.mgrs.nlp.NCProbeEnricher
  import org.apache.nlpcraft.probe.mgrs.nlp.impl.NCRequestImpl
 +import org.apache.nlpcraft.probe.mgrs.sentence.NCSentenceManager
 +import org.apache.nlpcraft.probe.mgrs.{NCProbeModel, NCProbeSynonym, 
NCProbeVariants}
+ import org.apache.nlpcraft.probe.mgrs.{NCProbeModel, NCProbeSynonym, 
NCProbeVariants}
  
  import java.io.Serializable
  import java.util

Reply via email to