2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/87268f2b439d/ changeset: 87268f2b439d user: dannon date: 2011-12-06 15:15:43 summary: Fix bad merge. affected #: 1 file diff -r 8993f7342095d3fac1feb3458ecee909ba678e11 -r 87268f2b439d844df43ce0065ec01e130c8b1a09 lib/galaxy/datatypes/tabular.py --- a/lib/galaxy/datatypes/tabular.py +++ b/lib/galaxy/datatypes/tabular.py @@ -353,7 +353,7 @@ dataset.metadata.columns = 12 dataset.metadata.column_types = ['str', 'int', 'str', 'int', 'int', 'str', 'str', 'int', 'int', 'str', 'str', 'str'] - def merge( split_files, output_file): + def merge( split_files, output_file): """ Multiple SAM files may each have headers. Since the headers should all be the same, remove the headers from files 1-n, keeping them in the first file only https://bitbucket.org/galaxy/galaxy-central/changeset/c28e9ef4036a/ changeset: c28e9ef4036a user: dannon date: 2011-12-06 15:15:57 summary: Merge. affected #: 1 file diff -r 87268f2b439d844df43ce0065ec01e130c8b1a09 -r c28e9ef4036aca6a897db2aa93517577b0afddda test/functional/test_library_templates.py --- a/test/functional/test_library_templates.py +++ b/test/functional/test_library_templates.py @@ -403,7 +403,7 @@ assert ldda is not None, 'Problem retrieving LibraryDatasetDatasetAssociation ldda from the database' self.browse_library( cntrller='library_admin', library_id=self.security.encode_id( library3.id ), - strings_displayed=[ ldda.name, admin_user.email ] ) + strings_displayed=[ ldda.name, 'bed' ] ) # Make sure the library template contents were correctly saved self.ldda_edit_info( 'library_admin', self.security.encode_id( library3.id ), Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.