1
0
mirror of https://github.com/ascribe/onion.git synced 2025-01-05 11:25:09 +01:00

merge conflict

This commit is contained in:
diminator 2015-08-05 14:50:44 +02:00
parent bd52bc8136
commit 5108ca2fc6

View File

@ -10,8 +10,9 @@ function getApiUrls(subdomain) {
'user': AppPrizeConstants.prizeApiEndpoint + subdomain + '/users/', 'user': AppPrizeConstants.prizeApiEndpoint + subdomain + '/users/',
'piece_submit_to_prize': AppPrizeConstants.prizeApiEndpoint + subdomain + '/pieces/${piece_id}/submit/', 'piece_submit_to_prize': AppPrizeConstants.prizeApiEndpoint + subdomain + '/pieces/${piece_id}/submit/',
'piece': AppPrizeConstants.prizeApiEndpoint + subdomain + '/pieces/${piece_id}/', 'piece': AppPrizeConstants.prizeApiEndpoint + subdomain + '/pieces/${piece_id}/',
'prize': AppPrizeConstants.prizeApiEndpoint + 'prize/' + subdomain + '/', 'prize': AppPrizeConstants.prizeApiEndpoint + subdomain + '/',
'jury': AppPrizeConstants.prizeApiEndpoint + 'prize/' + subdomain + '/jury/' 'jury': AppPrizeConstants.prizeApiEndpoint + subdomain + '/jury/'
};
} }
export default getApiUrls; export default getApiUrls;