1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/8402d189f38b/ changeset: 8402d189f38b user: smcmanus date: 2012-08-02 16:28:39 summary: Fixing minor merge issue affected #: 1 file
diff -r f1eb04839053a883401da55737ee2d5a338fae43 -r 8402d189f38ba88a0f83c9f76ad56cc05c82f363 lib/galaxy/model/__init__.py --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -314,15 +314,7 @@ self.stdout = "" self.stderr = "" self.prepare_input_files_cmd = prepare_files_cmd -<<<<<<< local - - # TODO: Add accessors for members defined in SQL Alchemy for the Task table. -=======
- def set_state( self, state ): - self.state = state - ->>>>>>> other def get_param_values( self, app ): """ Read encoded parameter values from the database and turn back into a
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.