From 5de5ff54d950d4e8cb8181016cf688faf6ea0a11 Mon Sep 17 00:00:00 2001
From: "for-solutions.com" <info@for-solutions.com>
Date: Sat, 7 Feb 2026 10:36:37 +0100
Subject: [PATCH] auto-sync: 2026-02-07 10:36

---
 nginx.conf.conflict | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 nginx.conf.conflict

diff --git a/nginx.conf.conflict b/nginx.conf.conflict
deleted file mode 100644
index 553c786..0000000
--- a/nginx.conf.conflict
+++ /dev/null
@@ -1 +0,0 @@
-kalkulator.electricentropy.eu:8090