You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@nlpcraft.apache.org by se...@apache.org on 2020/09/18 06:44:43 UTC

[incubator-nlpcraft] 01/01: Merge branch 'NLPCRAFT-117' into NLPCRAFT-41

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

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

commit 3a2f2704dedf5a0e434b32d5cec2cb02362eaa17
Merge: d36a992 e93767b
Author: Sergey Kamov <se...@apache.org>
AuthorDate: Fri Sep 18 09:44:18 2020 +0300

    Merge branch 'NLPCRAFT-117' into NLPCRAFT-41
    
    # Conflicts:
    #	nlpcraft/src/test/scala/org/apache/nlpcraft/server/rest/NCRestModelSpec.scala

 .../model/intent/impl/NCIntentSolverEngine.scala   | 29 +++++++++++++++++-----
 .../server/sugsyn/NCSuggestSynonymManager.scala    | 10 +++-----
 .../nlpcraft/server/rest/NCRestModelSpec.scala     |  2 +-
 3 files changed, 28 insertions(+), 13 deletions(-)