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/06/13 06:25:55 UTC
[incubator-nlpcraft] 01/02: Merge branch 'master' 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 cabb4c1f5cc0d126eb79f978e37cfe5bddeaa83f
Merge: 7479b7f c56b380
Author: Sergey Kamov <se...@apache.org>
AuthorDate: Sat Jun 13 09:25:33 2020 +0300
Merge branch 'master' into NLPCRAFT-41
nlpcraft/pom.xml | 10 +++-------
.../main/scala/org/apache/nlpcraft/examples/alarm/README.md | 2 +-
.../src/main/scala/org/apache/nlpcraft/examples/echo/README.md | 2 +-
.../scala/org/apache/nlpcraft/examples/helloworld/README.md | 2 +-
.../scala/org/apache/nlpcraft/examples/lightswitch/README.md | 2 +-
.../main/scala/org/apache/nlpcraft/examples/phone/README.md | 2 +-
.../src/main/scala/org/apache/nlpcraft/examples/sql/README.md | 2 +-
.../src/main/scala/org/apache/nlpcraft/examples/time/README.md | 2 +-
.../main/scala/org/apache/nlpcraft/examples/weather/README.md | 2 +-
.../src/main/scala/org/apache/nlpcraft/model/NCElement.java | 4 ++--
.../src/main/scala/org/apache/nlpcraft/model/NCIntent.java | 2 +-
.../main/scala/org/apache/nlpcraft/model/NCIntentMatch.java | 2 +-
.../src/main/scala/org/apache/nlpcraft/model/NCIntentRef.java | 2 +-
.../src/main/scala/org/apache/nlpcraft/model/NCIntentSkip.java | 2 +-
.../src/main/scala/org/apache/nlpcraft/model/NCIntentTerm.java | 2 +-
.../src/main/scala/org/apache/nlpcraft/model/NCMetadata.java | 2 +-
nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModel.java | 2 +-
.../main/scala/org/apache/nlpcraft/model/NCModelAdapter.java | 2 +-
.../main/scala/org/apache/nlpcraft/model/NCModelFactory.java | 2 +-
.../scala/org/apache/nlpcraft/model/NCModelFileAdapter.java | 2 +-
.../src/main/scala/org/apache/nlpcraft/model/NCModelView.java | 2 +-
nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCToken.java | 2 +-
.../nlpcraft/model/factories/basic/NCBasicModelFactory.java | 2 +-
.../nlpcraft/model/factories/spring/NCSpringModelFactory.java | 2 +-
24 files changed, 27 insertions(+), 31 deletions(-)