Merge all the things part 3 (DO NOT MERGE) #506
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 tasks
… into temp-integration-pt3
* Audio Content Highlighting * Bug fix
… into temp-integration-pt3
…516) * Replace a few refresher lesson links with concept card tags, instead. * Address reviewer feedback. * Correctly address reviewer feedback.
Conflicts: utility/src/main/java/org/oppia/util/parser/HtmlParser.kt
Conflicts: app/src/main/res/layout/content_item.xml app/src/main/res/layout/feedback_item.xml
|
Hi @BenHenning. Due to recent changes in the "develop" branch, this PR now has a merge conflict. Please follow this link if you need help resolving the conflict, so that the PR can be merged. Thanks! |
|
The third prototype was built & is no longer needed. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the integrated branch (with some manual tweaks & fixes) for #494. The following PRs are merged (but may not yet be fully functional):