From bc41be61949ad296f7e0ac812d949010909bb572 Mon Sep 17 00:00:00 2001
From: UrloMythus <urlo30@proton.me>
Date: Fri, 18 Jul 2025 09:56:36 +0200
Subject: [PATCH] Fix for Dockerfile

---
 Dockerfile | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d403f95..0f135ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,4 @@
 FROM python:3.11-slim-bullseye
-<<<<<<< HEAD
-=======
-
-# Set the working directory in the container to /app
->>>>>>> 655b62ab301a681e87648f5e1b1296b9cb292d14
 WORKDIR /app
 RUN apt-get update && apt-get install -y git
 RUN git clone https://github.com/YourUsername/YourRepoName.git .