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)