chore: run black formatter

Author: Mr-Sunglasses

podman/errors/exceptions.py

@@ -1,10 +1,6 @@
 """Podman API Errors."""
 
-<<<<<<< HEAD
-from typing import List, Dict, Optional, Union, TYPE_CHECKING
-=======
 from typing import Optional, Union, TYPE_CHECKING
->>>>>>> fa8eb3e (Fix Code based on ruff 0.3->0.8.1)
 from collections.abc import Iterable
 
 from requests import Response
@@ -205,7 +201,6 @@ def __str__(self) -> str:
 
 
 class StreamParseError(RuntimeError):
-<<<<<<< HEAD
     """Exception raised when parsing a stream fails."""
 
     def __init__(self, reason: str):
@@ -215,7 +210,4 @@ def __init__(self, reason: str):
             reason: Description of the parsing error.
         """
         super().__init__(reason)
-=======
-    def __init__(self, reason):
->>>>>>> b8f28e2 (Implement "decode" parameter in pull())
         self.msg = reason