From e5311b4fabb648d79c2784a31c2bbbc4f6dd8f74 Mon Sep 17 00:00:00 2001
From: philipp <philipp@hofer.link>
Date: Wed, 17 Jan 2024 19:06:12 +0100
Subject: [PATCH] try

---
 Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index bf52e2a..cd398b9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,10 @@
 # 2. Tag the image: `docker tag <id> git.hofer.link/ruderverein-donau-linz/rowing-ci:<date>`
 # 3. Push the image: `docker push git.hofer.link/ruderverein-donau-linz/rowing-ci:<date>`
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 62171d7 (try)
 FROM rust:1.75.0
 
 RUN apt-get update && apt-get install -y sqlite3