From 59a16181a0f40765d13364fedba3d4917ec65f38 Mon Sep 17 00:00:00 2001
From: Jelle Treep <40466121+jelletreep@users.noreply.github.com>
Date: Wed, 4 Feb 2026 14:32:30 +0100
Subject: [PATCH] fix conflict

Updated the image for the workspace to include nginx.
---
 molecule/openwebui/molecule.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/molecule/openwebui/molecule.yml b/molecule/openwebui/molecule.yml
index 43b271a..0f0b1f3 100644
--- a/molecule/openwebui/molecule.yml
+++ b/molecule/openwebui/molecule.yml
@@ -10,12 +10,8 @@ driver:
         password: $DOCKER_PW
 platforms: # Test on ubuntu jammy by default
   - name: workspace-src-ubuntu_jammy
-<<<<<<< add_openwebui_role
     image: ghcr.io/utrechtuniversity/src-test-workspace:ubuntu_jammy-nginx
-=======
-    image: ghcr.io/utrechtuniversity/src-test-workspace:ubuntu_jammy
     command: /sbin/init
->>>>>>> main
     <<: *image_settings
 provisioner:
   name: ansible