Skip to content

Commit

Permalink
Fix screwed conflict resolution, my bad.
Browse files Browse the repository at this point in the history
  • Loading branch information
hjoliver committed Mar 10, 2024
1 parent aa2c91a commit 6bb2cfa
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions cylc/flow/task_pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -1704,12 +1704,7 @@ def _standardise_prereqs(
# The CP from --pre is invalid:
LOG.warning(f'Invalid pre cycle point set:\n {exc.args[0]}')
else:
_prereqs[
pre.duplicate(
task_sel=msg,
cycle=standardise_point_string(pre['cycle'])
)
] = prereq
_prereqs[pre.duplicate(task_sel=msg, cycle=cycle)] = prereq
return _prereqs

def _standardise_outputs(
Expand Down

0 comments on commit 6bb2cfa

Please sign in to comment.