Fix funky merge

pytroll · May 27, 2024 · 1ed636f · 1ed636f
1 parent 80716be
commit 1ed636f
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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