Resolve conflict in previous commit

2026-09-24 16:30:27 +08:00 · 2015-03-11 13:00:32 -04:00
parent 4992d0a893
commit d4e37db5d9
1 changed files with 0 additions and 4 deletions
@@ -165,10 +165,6 @@ class HDAManager( datasets.DatasetAssociationManager,

        if hda.creating_job_associations:
            job = hda.creating_job_associations[0].job
-<<<<<<< HEAD
-            job.mark_deleted( self.app.config.track_jobs_in_database )
-=======
->>>>>>> fix.history-purge
            if not job.finished:
                # signal to stop the creating job
                self.app.job_manager.job_stop_queue.put( job.id )