From 686fa86c3f2f1e1f6e1c4e56cc5dc46d3f3ec0f6 Mon Sep 17 00:00:00 2001
From: cronekorkn <git@ckn.li>
Date: Tue, 28 May 2024 11:07:33 +0200
Subject: [PATCH 1/2] conflicttest

---
 nodes/home.server.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nodes/home.server.py b/nodes/home.server.py
index c34e178..ccb1592 100644
--- a/nodes/home.server.py
+++ b/nodes/home.server.py
@@ -1,3 +1,5 @@
+# test
+
 {
     'hostname': '10.0.0.2',
     'groups': [
@@ -111,7 +113,7 @@
         },
         'nextcloud': {
             'hostname': 'cloud.sublimity.de',
-            'version': '28.0.1',
+            'version': '29.0.1',
             'config': {
                 'instanceid': 'oci6dw1woodz',
                 'secret': '!decrypt:encrypt$gAAAAABj96CFynVtEgsje7173zjQAcY7xQG3uyf5cxE-sJAvhyPh_KUykTKdwnExc8NTDJ8RIGUmVfgC6or5crnYaggARPIEg5-Cb0xVdEPPZ3oZ01ImLmynLu3qXT9O8kVM-H21--OKeztMRn7bySsbXdWEGtETFQ==',
-- 
2.39.5


From 09f085336e754b48b6aed9e08a7949af3f2fbf5e Mon Sep 17 00:00:00 2001
From: cronekorkn <git@ckn.li>
Date: Tue, 28 May 2024 11:09:24 +0200
Subject: [PATCH 2/2] s

---
 nodes/netcup.mails.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nodes/netcup.mails.py b/nodes/netcup.mails.py
index d9643f0..6b8a38b 100644
--- a/nodes/netcup.mails.py
+++ b/nodes/netcup.mails.py
@@ -1,3 +1,5 @@
+# test
+
 {
     'hostname': '202.61.255.108',
     'groups': [
-- 
2.39.5