# Conflicts: # app/models/attachment.rb # app/views/api/v1/attachments/_simple_detail.json.jbuilder |
||
|---|---|---|
| .. | ||
| migrate | ||
| seeds.rb | ||
| structure.sql | ||
# Conflicts: # app/models/attachment.rb # app/views/api/v1/attachments/_simple_detail.json.jbuilder |
||
|---|---|---|
| .. | ||
| migrate | ||
| seeds.rb | ||
| structure.sql | ||