|
@@ -630,10 +630,6 @@ class FlatCAMExcellon(FlatCAMObj, Excellon):
|
|
|
# from predecessors.
|
|
# from predecessors.
|
|
|
self.ser_attrs += ['options', 'kind']
|
|
self.ser_attrs += ['options', 'kind']
|
|
|
|
|
|
|
|
- @staticmethod
|
|
|
|
|
- def merge(exc_list, exc_final):
|
|
|
|
|
- FlatCAMExcellon.merge(exc_list,exc_final,False)
|
|
|
|
|
-
|
|
|
|
|
@staticmethod
|
|
@staticmethod
|
|
|
def merge(exc_list, exc_final, copy_options):
|
|
def merge(exc_list, exc_final, copy_options):
|
|
|
"""
|
|
"""
|