Skip to content

Merge down for Sprint release 2021-05-10#3141

Merged
rtibbles merged 8 commits intolearningequality:unstablefrom
bjester:merge-down-prerelease-2021-05-10
May 10, 2021
Merged

Merge down for Sprint release 2021-05-10#3141
rtibbles merged 8 commits intolearningequality:unstablefrom
bjester:merge-down-prerelease-2021-05-10

Conversation

@bjester
Copy link
Copy Markdown
Member

@bjester bjester commented May 10, 2021

Summary

Merging hotfixes changes down to unstable

Merge results

(venv) bjester@phizbo:~/Projects/learningequality/studio2$ git merge unstable 
Auto-merging contentcuration/locale/pt_BR/LC_MESSAGES/contentcuration-messages.json
Auto-merging contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.json
Auto-merging contentcuration/locale/fr_FR/LC_MESSAGES/contentcuration-messages.json
Auto-merging contentcuration/locale/es_ES/LC_MESSAGES/contentcuration-messages.json
Auto-merging contentcuration/locale/ar/LC_MESSAGES/contentcuration-messages.json
Auto-merging contentcuration/contentcuration/viewsets/user.py
CONFLICT (content): Merge conflict in contentcuration/contentcuration/viewsets/user.py
Automatic merge failed; fix conflicts and then commit the result.

@rtibbles rtibbles merged commit 979a544 into learningequality:unstable May 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants