forked from Mirror/ollama4j
		
	Fixes merge conflicts
This commit is contained in:
		| @@ -7,11 +7,9 @@ import io.github.ollama4j.models.chat.OllamaChatMessage; | |||||||
| import io.github.ollama4j.models.chat.OllamaChatRequest; | import io.github.ollama4j.models.chat.OllamaChatRequest; | ||||||
| import io.github.ollama4j.models.chat.OllamaChatResult; | import io.github.ollama4j.models.chat.OllamaChatResult; | ||||||
| import io.github.ollama4j.models.response.OllamaErrorResponse; | import io.github.ollama4j.models.response.OllamaErrorResponse; | ||||||
| import io.github.ollama4j.models.response.OllamaResult; |  | ||||||
| import io.github.ollama4j.models.chat.OllamaChatResponseModel; | import io.github.ollama4j.models.chat.OllamaChatResponseModel; | ||||||
| import io.github.ollama4j.models.chat.OllamaChatStreamObserver; | import io.github.ollama4j.models.chat.OllamaChatStreamObserver; | ||||||
| import io.github.ollama4j.models.generate.OllamaStreamHandler; | import io.github.ollama4j.models.generate.OllamaStreamHandler; | ||||||
| import io.github.ollama4j.utils.OllamaRequestBody; |  | ||||||
| import io.github.ollama4j.utils.Utils; | import io.github.ollama4j.utils.Utils; | ||||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Markus Klenke
					Markus Klenke