This is an automated email from the ASF dual-hosted git repository. aradzinski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 57aaf678ead4c570be2dcac866dbc5877d1e60ab Merge: e68cafb fc77832 Author: Aaron Radzinski <[email protected]> AuthorDate: Tue Sep 22 11:57:47 2020 -0700 Merge branch 'master' of https://github.com/apache/incubator-nlpcraft nlpcraft/src/main/resources/nlpcraft.conf | 12 --- .../probe/mgrs/conversation/NCConversation.scala | 9 +- .../mgrs/conversation/NCConversationManager.scala | 92 ++++++++++------- .../mgrs/dialogflow/NCDialogFlowManager.scala | 103 ++++++++++-------- .../conversation/NCConversationTimeoutSpec.scala | 115 +++++++++++++++++++++ 5 files changed, 235 insertions(+), 96 deletions(-)
