CLN: remove compat.add_metaclass (pandas-dev#26165)

Author: ryanreh99

pandas/io/excel/_base.py

@@ -327,12 +327,16 @@ def read_excel(io,
         **kwds)
 
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 class _BaseExcelReader(metaclass=abc.ABCMeta):
 =======
 @add_metaclass(abc.ABCMeta)
 class _BaseExcelReader:
 >>>>>>> c18c8be77... CLN: remove unneeded inheritance from base object (#26128)
+=======
+class _BaseExcelReader(metaclass=abc.ABCMeta):
+>>>>>>> 150eddf6d... CLN: remove compat.add_metaclass (#26165)
 
     @property
     @abc.abstractmethod
@@ -490,12 +494,16 @@ def parse(self,
             return output[asheetname]
 
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 class ExcelWriter(metaclass=abc.ABCMeta):
 =======
 @add_metaclass(abc.ABCMeta)
 class ExcelWriter:
 >>>>>>> c18c8be77... CLN: remove unneeded inheritance from base object (#26128)
+=======
+class ExcelWriter(metaclass=abc.ABCMeta):
+>>>>>>> 150eddf6d... CLN: remove compat.add_metaclass (#26165)
     """
     Class for writing DataFrame objects into excel sheets, default is to use
     xlwt for xls, openpyxl for xlsx.  See DataFrame.to_excel for typical usage.

pandas/tseries/holiday.py

@@ -323,12 +323,16 @@ def __new__(cls, clsname, bases, attrs):
         return calendar_class
 
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 class AbstractHolidayCalendar(metaclass=HolidayCalendarMetaClass):
 =======
 @add_metaclass(HolidayCalendarMetaClass)
 class AbstractHolidayCalendar:
 >>>>>>> c18c8be77... CLN: remove unneeded inheritance from base object (#26128)
+=======
+class AbstractHolidayCalendar(metaclass=HolidayCalendarMetaClass):
+>>>>>>> 150eddf6d... CLN: remove compat.add_metaclass (#26165)
     """
     Abstract interface to create holidays following certain rules.
     """