merge upstream and fix conflicts

This commit is contained in:
likelovewant
2025-02-10 15:06:45 +08:00
674 changed files with 7553 additions and 20752 deletions

View File

@@ -17,6 +17,6 @@ If you want to build the installer, youll need to install
In the top directory of this repo, run the following powershell script
to build the ollama CLI, ollama app, and ollama installer.
```
```powershell
powershell -ExecutionPolicy Bypass -File .\scripts\build_windows.ps1
```