Merge fix.

2026-04-07 19:00:28 -04:00
parent d1ed1fb22d 580c7a52da
commit fc5237f65c
1 changed files with 0 additions and 4 deletions
@@ -112,13 +112,9 @@ services:
    restart: unless-stopped
  ollama:
    container_name: ollama
-<<<<<<< HEAD
-    image: ollama/ollama@sha256:87d71eb588a28c747094ca5d011392a3790f6ea9bd9c87594780ad7c65cc7ed1
-=======
    environment:
      OLLAMA_VULKAN: 1
    image: ollama/ollama@sha256:0455f166da85b1d07f694c33ba09278ca649603c0611ba8e46272b16eed7fccd
->>>>>>> 580c7a5 (Adding Vulkan support for Intel Arc.)
    ports:
      - 11434:11434
    privileged: true