Skip to content

Commit

Permalink
fix return
Browse files Browse the repository at this point in the history
  • Loading branch information
vmaerten committed Jul 1, 2024
1 parent dad0c63 commit a46d376
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion taskfile/ast/taskfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ func (t1 *Taskfile) Merge(t2 *Taskfile, include *Include) error {
t1.Vars.Merge(t2.Vars, include)
t1.Env.Merge(t2.Env, include)
return t1.Tasks.Merge(t2.Tasks, include, t1.Vars)
return err
}

func (tf *Taskfile) UnmarshalYAML(node *yaml.Node) error {
Expand Down

0 comments on commit a46d376

Please sign in to comment.