annotate app/views/issue_categories/show.api.rsb @ 1485:c8d3ad483bea redmine-2.4-integration

Fix stray merge markers

api.issue_category do
  api.id @category.id
  api.project(:id => @category.project_id, :name => @category.project.name) unless @category.project.nil?
  api.name @category.name
  api.assigned_to(:id => @category.assigned_to_id, :name => @category.assigned_to.name) unless @category.assigned_to.nil?
end