annotate app/views/queries/index.api.rsb @ 1485:c8d3ad483bea redmine-2.4-integration

Fix stray merge markers

api.array :queries, api_meta(:total_count => @query_count, :offset => @offset, :limit => @limit) do
  @queries.each do |query|
    api.query do
      api.id          query.id
      api.name        query.name
      api.is_public   query.is_public?
      api.project_id  query.project_id
    end
  end
end