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 2021/04/23 15:32:18 UTC
[incubator-nlpcraft] 01/01: Merge branch 'master' into
NLPCRAFT-91-MODULES
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-91-MODULES
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit f0174be78d03201682563976188afeb7dbb00019
Merge: 95baa7f ad2c416
Author: Sergey Kamov <sk...@gmail.com>
AuthorDate: Fri Apr 23 18:31:50 2021 +0300
Merge branch 'master' into NLPCRAFT-91-MODULES
# Conflicts:
# nlpcraft/src/main/resources/nlpcraft.conf
.../apache/nlpcraft/examples/lightswitch/LightSwitchKotlinModel.kt | 5 ++---
nlpcraft/src/main/resources/nlpcraft.conf | 2 +-
.../apache/nlpcraft/model/intent/compiler/NCIdlCompilerBase.scala | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --cc nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/examples/lightswitch/LightSwitchKotlinModel.kt
index 8aa28c9,a1ffc19..13a12e5
--- a/nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/examples/lightswitch/LightSwitchKotlinModel.kt
+++ b/nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/examples/lightswitch/LightSwitchKotlinModel.kt
@@@ -30,10 -30,9 +30,9 @@@ import java.util.stream.Collector
* You can easily modify intent callbacks to perform the actual light switching using
* HomeKit or Arduino-based controllers.
*
- *
* See 'README.md' file in the same folder for running and testing instructions.
*/
-class LightSwitchKotlinModel : NCModelFileAdapter("org/apache/nlpcraft/examples/lightswitch/lightswitch_model.yaml") {
+class LightSwitchKotlinModel : NCModelFileAdapter("lightswitch_model.yaml") {
/**
* Intent and its on-match callback.
*