Git git merge issue in pangocffi/context.py

leifgehrmann · Jun 15, 2024 · e291661 · e291661
1 parent 6f5d51c
commit e291661
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/pangocffi/context.py b/pangocffi/context.py
@@ -86,10 +86,6 @@ def load_font(self, font_description: FontDescription) -> Font:
             the Pango font description.
         """
         return Font.from_pointer(
-<<<<<<< HEAD
             pango.pango_context_load_font(self._pointer,
                                           font_description._pointer)
-=======
-            pango.pango_context_load_font(self._pointer, font_description._pointer)
->>>>>>> f15b3c59d7c35b35dd67899c86be84a568727b6c
         )