diff options
| author | phecho <phecho@163.com> | 2016-12-21 10:58:41 +0800 |
|---|---|---|
| committer | phecho <phecho@163.com> | 2016-12-21 10:58:41 +0800 |
| commit | 4724367e3b9c10af23bb6596f8f678477927c8c3 (patch) | |
| tree | 06ee4e860252222c1784e182d87e22b879451751 /app/Formatter/BoardColumnFormatter.php | |
| parent | 56d00ac1592ba5ab7006dfd161f1893e1fdc9bb0 (diff) | |
| parent | 9d5d389de841705450190fb1ebbaa11393870dfe (diff) | |
Fix conflict
Diffstat (limited to 'app/Formatter/BoardColumnFormatter.php')
| -rw-r--r-- | app/Formatter/BoardColumnFormatter.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/Formatter/BoardColumnFormatter.php b/app/Formatter/BoardColumnFormatter.php index 85d31b5c..0d59f54e 100644 --- a/app/Formatter/BoardColumnFormatter.php +++ b/app/Formatter/BoardColumnFormatter.php @@ -79,7 +79,7 @@ class BoardColumnFormatter extends BaseFormatter implements FormatterInterface { foreach ($this->columns as &$column) { $column['id'] = (int) $column['id']; - $column['tasks'] = BoardTaskFormatter::getInstance($this->container) + $column['tasks'] = $this->boardTaskFormatter ->withTasks($this->tasks) ->withTags($this->tags) ->withSwimlaneId($this->swimlaneId) |