address merge conflixts

pandas-dev · mroeschke · Aug 31, 2022 · Aug 15, 2022 · Aug 15, 2022 · Aug 15, 2022
commit 420b83707d79d1de56641d9fff38efa0b3d5cb7b
diff --git a/pandas/core/generic.py b/pandas/core/generic.py
@@ -4619,9 +4619,7 @@ def _update_inplace(self, result, verify_is_copy: bool_t = True) -> None:
         self._maybe_update_cacher(verify_is_copy=verify_is_copy, inplace=True)
 
     @final
-    def add_prefix(
-        self: NDFrameT, prefix: str, axis: Axis | None = None
-    ) -> NDFrameT:
+    def add_prefix(self: NDFrameT, prefix: str, axis: Axis | None = None) -> NDFrameT:
         """
         Prefix labels with string `prefix`.
 
@@ -4693,9 +4691,7 @@ def add_prefix(
         return self._rename(**mapper)  # type: ignore[return-value, arg-type]
 
     @final
-    def add_suffix(
-        self: NDFrameT, suffix: str, axis: Axis | None = None
-    ) -> NDFrameT:
+    def add_suffix(self: NDFrameT, suffix: str, axis: Axis | None = None) -> NDFrameT:
         """
         Suffix labels with string `suffix`.