From 1ed636f247c8db532154b80b7fbb390a20fd9050 Mon Sep 17 00:00:00 2001
From: Martin Raspaud <martin.raspaud@smhi.se>
Date: Mon, 27 May 2024 11:19:38 +0200
Subject: [PATCH] Fix funky merge

---
 trollmoves/server.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/trollmoves/server.py b/trollmoves/server.py
index 19aa1d2..8d2938e 100644
--- a/trollmoves/server.py
+++ b/trollmoves/server.py
@@ -629,12 +629,8 @@ def _form_connection_parameters_dict(original):
         if key in CONNECTION_CONFIG_ITEMS:
             warnings.warn(
                 f"Consider using connection_parameters__{key} instead of {key}.",
-<<<<<<< fix-utcnow
                 category=UserWarning,
                 stacklevel=2)
-=======
-                category=UserWarning, stacklevel=2)
->>>>>>> main
             res["connection_parameters"][key] = original[key]
             del res[key]
     return res