1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/688b3b621cd4/ changeset: 688b3b621cd4 user: natefoo date: 2012-05-23 18:12:13 summary: Fix an artifact left over from an incomplete merge affected #: 1 file diff -r e27bdbf11ec08cebd752e3534d4a7d2c799c3961 -r 688b3b621cd48cefefaf73081505bbe4749a217d universe_wsgi.ini.sample --- a/universe_wsgi.ini.sample +++ b/universe_wsgi.ini.sample @@ -681,16 +681,12 @@ #pbs_stage_path = #pbs_dataset_server = -<<<<<<< local # The URL to the myExperiment instance being used (omit scheme but include port) myexperiment_url = www.myexperiment.org:80 -# ---- Tool Job Runners ----------------------------------------------------- -======= # This option allows users to see the full path of datasets via the "View # Details" option in the history. Administrators can always see this. #expose_dataset_path = False ->>>>>>> other # ---- Per-Tool Job Management ---------------------------------------------- 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.