Remove potention merge conflicting bloc

pyiricdata/Client.py

@@ -169,25 +169,6 @@ class Client:
     def get_dataset_filelist(self, dataset_id):
         sys.stderr.write("DEPRECATED: Please use " +
                          "get_list_datafiles(dataset_id=dataset_id)\n")
-
-#        df = pd.DataFrame(columns=['file_id', 'file_name', 'file_hash', 'file_slug'])
-#        if dataset_id not in self.datasets.index:
-#            sys.stderr.write(
-#                "ERROR: Dataset '{}' does not exist or you do not have permission to access it.".format(dataset_id) +\
-#                " Try Client.datasets for more details.\n")
-#            return df
-#        files = self.session.get(os.path.join(self.url, 'secure/dataset', dataset_id, 'file-list')).text.split('\n')
-#        file_id_list = np.unique([x.split('/')[-1] for x in files])
-#        df.file_id = file_id_list
-#        if files != ['']:
-#            for index, row in df.iterrows():
-#                file_meta = self.get_file_metadata(row['file_id'])
-#                assert not file_meta is None
-#                row['file_name'] = file_meta['filename']
-#                row['file_slug'] = file_meta['iric_data_id']
-#                row['file_hash'] = file_meta['hash']
-#        df.index = df.file_slug.copy()
-#        df.index.name = 'ID'
         return(self.get_list_datafiles(dataset_id=dataset_id))
 
     """ Get DatasetId by name"""