From f7e355702f1a17a6ae0fc3524cabde87d2d40565 Mon Sep 17 00:00:00 2001
From: Stephane Bortzmeyer <stephane+framagit@bortzmeyer.org>
Date: Sun, 16 Jun 2024 20:37:42 +0200
Subject: [PATCH] Post-merge cleaning

---
 check_expire | 1 -
 1 file changed, 1 deletion(-)

diff --git a/check_expire b/check_expire
index 625e9f3..329304e 100755
--- a/check_expire
+++ b/check_expire
@@ -149,7 +149,6 @@ for server in servers:
         else:
             found = True
             break
->>>>>>> 3af8b3103483d8f542475b824fce57e28d58e242
 if not found:
     if errors != "":
         error(errors)