Update taskfile/ast/taskfile.go

fix return
go-task · Jul 1, 2024 · 1becd9b · 1becd9b
1 parent 08e41bf
commit 1becd9b
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/taskfile/ast/taskfile.go b/taskfile/ast/taskfile.go
@@ -55,8 +55,7 @@ func (t1 *Taskfile) Merge(t2 *Taskfile, include *Include) error {
  }
  t1.Vars.Merge(t2.Vars, include)
  t1.Env.Merge(t2.Env, include)
- err := t1.Tasks.Merge(t2.Tasks, include, t1.Vars)
- return err
+ return t1.Tasks.Merge(t2.Tasks, include, t1.Vars)
 }
 
 func (tf *Taskfile) UnmarshalYAML(node *yaml.Node) error {