From 6460388784cd1de158fcf8ed88659dee787aee65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Bu=C3=9Fmann?= <simon.bussmann@tum.de>
Date: Sun, 5 Jun 2022 19:19:52 +0200
Subject: [PATCH 1/2] testing merge conflicts

---
 testfile.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 testfile.txt

diff --git a/testfile.txt b/testfile.txt
new file mode 100644
index 0000000..085a530
--- /dev/null
+++ b/testfile.txt
@@ -0,0 +1 @@
+this is a dev testfile

From 680efb46176b84e6b553922beb683066ca73679d Mon Sep 17 00:00:00 2001
From: cato <47259183+cato447@users.noreply.github.com>
Date: Sun, 5 Jun 2022 19:26:50 +0200
Subject: [PATCH 2/2] Revert "Merge branch 'main' into dev"

This reverts commit b5cc8242d6484e6435d7c03189ca1609d346555c.