resolved version conflicts

This commit is contained in:
Ben Wheeler 2018-07-20 21:08:33 -04:00
commit 1ad7ce4f4c

View file

@ -174,9 +174,9 @@ module.exports.setCuratedStudios = items => ({
items: items
});
module.exports.addToProjectStudios = studioId => ({
module.exports.addToProjectStudios = studioStub => ({
type: 'ADD_TO_PROJECT_STUDIOS',
studioId: studioId
studioStub: studioStub
});
module.exports.removeFromProjectStudios = studioId => ({