# Conflicts: # app/controllers/attachments_controller.rb # app/services/api/v1/issues/concerns/checkable.rb # app/services/api/v1/issues/concerns/loadable.rb |
||
|---|---|---|
| .. | ||
| attachments | ||
| issues | ||
| project_topics | ||
| projects | ||
| users | ||
# Conflicts: # app/controllers/attachments_controller.rb # app/services/api/v1/issues/concerns/checkable.rb # app/services/api/v1/issues/concerns/loadable.rb |
||
|---|---|---|
| .. | ||
| attachments | ||
| issues | ||
| project_topics | ||
| projects | ||
| users | ||