Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into gpt4all-java-bindings
Browse files Browse the repository at this point in the history
# Conflicts:
#	core/src/commonMain/kotlin/com/xebia/functional/xef/auto/CoreAIScope.kt
#	core/src/commonMain/kotlin/com/xebia/functional/xef/auto/PromptConfiguration.kt
#	core/src/commonMain/kotlin/com/xebia/functional/xef/llm/Chat.kt
#	core/src/commonMain/kotlin/com/xebia/functional/xef/llm/ChatWithFunctions.kt
#	examples/kotlin/src/main/kotlin/com/xebia/functional/xef/auto/gpt4all/Chat.kt
#	examples/kotlin/src/main/kotlin/com/xebia/functional/xef/auto/manual/NoAI.kt
#	gpt4all-kotlin/build.gradle.kts
#	gpt4all-kotlin/src/jvmMain/kotlin/com/xebia/functional/gpt4all/GPT4All.kt
#	gpt4all-kotlin/src/jvmMain/kotlin/com/xebia/functional/gpt4all/GPT4AllModel.kt
#	gpt4all-kotlin/src/jvmMain/kotlin/com/xebia/functional/gpt4all/HuggingFaceLocalEmbeddings.kt
#	openai/src/commonMain/kotlin/com/xebia/functional/xef/auto/llm/openai/DeserializerLLMAgent.kt
#	openai/src/commonMain/kotlin/com/xebia/functional/xef/auto/llm/openai/OpenAIClient.kt
#	openai/src/commonMain/kotlin/com/xebia/functional/xef/auto/llm/openai/OpenAIEmbeddings.kt
  • Loading branch information
raulraja committed Jul 3, 2023
2 parents b238450 + b1ebeea commit dbc03de
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit dbc03de

Please sign in to comment.