Add empty line for clarity

pymupdf · Jan 7, 2025 · 882d56f · 882d56f
1 parent dfba2d1
commit 882d56f
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/__init__.py b/src/__init__.py
@@ -4209,10 +4209,7 @@ def extract_image(self, xref):
 
         o = mupdf.pdf_dict_geta(obj, PDF_NAME('SMask'), PDF_NAME('Mask'))
         cs_string = mupdf.pdf_dict_geta(obj, PDF_NAME('ColorSpace'), PDF_NAME('CS')).pdf_to_name()
-<<<<<<< HEAD
 
-=======
->>>>>>> 4be00558 (Address 4186)
         if o.m_internal:
             smask = mupdf.pdf_to_num(o)