From 30194034a1c55c9389302d524b05bebeb1f923d1 Mon Sep 17 00:00:00 2001
From: Jonas Bengtsson <jonas.bengtsson@vivab.info>
Date: Sun, 20 Sep 2026 18:03:35 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7=20resolve=20conflict?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pytest_output.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 backend/pytest_output.txt

diff --git a/backend/pytest_output.txt b/backend/pytest_output.txt
deleted file mode 100644
index e69de29..0000000