[cloud_firestore_platform_interface] Fix three-way merge in test file. #2209
Conversation
This file contains hidden or 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
Even though my last push didn't have conflicts with the base branch, there was a change that I missed: 4d7b2bd#diff-e36a6cd96b7ef43422dfb1197627e7f8 I fixed the same issue in my change, but deleting the OTHER 'source' key in the map: bd9bcd4#diff-e36a6cd96b7ef43422dfb1197627e7f8 This commit reverts my part of the change, so tests pass again.
ferhatb
approved these changes
Mar 20, 2020
|
(Merged to unbreak tree) |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Description
Even though my last push didn't have conflicts with the base branch (according to Github), there was a change that I missed:
4d7b2bd#diff-e36a6cd96b7ef43422dfb1197627e7f8
I fixed the same issue in my change, but deleting the OTHER 'source' key in the map:
bd9bcd4#diff-e36a6cd96b7ef43422dfb1197627e7f8
The result is now that the file has zero entries in said Map, and tests broke in
master.This commit reverts my part of the change, so tests pass again.
Related Issues
Checklist
Before you create this PR confirm that it meets all requirements listed below by checking the relevant checkboxes (
[x]). This will ensure a smooth and quick review process.///).flutter analyze) does not report any problems on my PR.Breaking Change
Does your PR require plugin users to manually update their apps to accommodate your change?