From f6c2c42451fabeda12a927adf817763847fea1ad Mon Sep 17 00:00:00 2001
From: Tom Langan <tom.langan@hotmail.com>
Date: Sun, 29 Oct 2023 01:20:45 +0000
Subject: [PATCH] fixes

---
 docker-compose.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 72ea586..5a5895d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,12 +30,8 @@ services:
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
-<<<<<<< HEAD
-    image: sd-auto:63
-    restart: always
-=======
     image: sd-auto:67
->>>>>>> 6a34739135eb112667f00943c1fac98ab294716a
+    restart: always
     environment:
       - CLI_ARGS=--allow-code --medvram --enable-insecure-extension-access --xformers --api --listen --port 7880 --ckpt models/Stable-diffusion/sd_xl_base_1.0.safetensors