This is an automated email from the ASF dual-hosted git repository. sergeykamov pushed a commit to branch NLPCRAFT-491 in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 86e48ce2daa28e4663bd172bc1f4a8261fa78b41 Merge: e4f5cb3e eb3785e5 Author: Sergey Kamov <[email protected]> AuthorDate: Mon Apr 4 13:18:39 2022 +0300 Merge branch 'master' into NLPCRAFT-491 # Conflicts: # nlpcraft/src/main/scala/org/apache/nlpcraft/NCEntityMapper.java # nlpcraft/src/main/scala/org/apache/nlpcraft/internal/impl/NCModelPipelineManager.scala # nlpcraft/src/test/scala/org/apache/nlpcraft/nlp/NCEntityMapperSpec.scala .../scala/org/apache/nlpcraft/NCEntityMapper.java | 8 ++-- .../internal/impl/NCModelPipelineManager.scala | 2 +- .../apache/nlpcraft/nlp/NCEntityMapperSpec.scala | 44 +++++++++++++--------- 3 files changed, 31 insertions(+), 23 deletions(-)
