Resolved conflicts - Fixed issue #812 #876
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
Conflicts: app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java app/src/main/res/values/strings.xml
Codecov Report
@@ Coverage Diff @@
## master #876 +/- ##
=========================================
- Coverage 6.91% 6.86% -0.05%
=========================================
Files 95 95
Lines 5018 5052 +34
Branches 471 476 +5
=========================================
Hits 347 347
- Misses 4644 4678 +34
Partials 27 27
Continue to review full report at Codecov.
|
Closed
|
Merged manually after fixing the conflicts. |
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.
Resolved conflicts at #842 . Functionality works as intended, I have already tested it on different devices, but can someone else also test and merge it? Probably I won't be able to merge this since I am contributor.