Conflicts: - `.rubocop_todo.yml`: Took upstream's version of the conflicting lines. |
||
|---|---|---|
| .. | ||
| migrate | ||
| post_migrate | ||
| seeds | ||
| views | ||
| schema.rb | ||
| seeds.rb | ||
Conflicts: - `.rubocop_todo.yml`: Took upstream's version of the conflicting lines. |
||
|---|---|---|
| .. | ||
| migrate | ||
| post_migrate | ||
| seeds | ||
| views | ||
| schema.rb | ||
| seeds.rb | ||