From 65561bce22a0d794488a2736160ef4c0eb933e50 Mon Sep 17 00:00:00 2001
From: ahoemann <ahoemann@proton.me>
Date: Thu, 5 Dec 2024 12:58:02 +0100
Subject: [PATCH] remove: conflict

---
 .Dockerfile.kate-swp | Bin 0 -> 48 bytes
 requirements.txt     |   1 -
 2 files changed, 1 deletion(-)
 create mode 100644 .Dockerfile.kate-swp

diff --git a/.Dockerfile.kate-swp b/.Dockerfile.kate-swp
new file mode 100644
index 0000000000000000000000000000000000000000..a8084efee440019afc0244d14bfdb64ce6489480
GIT binary patch
literal 48
zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?VnxmDcWxgb#UL*mU?MRu8>Tg!t&nuA>d
DN^B2}

literal 0
HcmV?d00001

diff --git a/requirements.txt b/requirements.txt
index 3c94e51..4319354 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,2 @@
 flask
 waitress
-requests