Skip to content

Commit

Permalink
[cloud_firestore_platform_interface] Fix three-way merge in test file. (
Browse files Browse the repository at this point in the history
firebase#2209)

Even though my last push didn't have conflicts with the base branch,
there was a change that I missed:

firebase@4d7b2bd#diff-e36a6cd96b7ef43422dfb1197627e7f8

I fixed the same issue in my change, but deleting the OTHER 'source' key
in the map:

firebase@bd9bcd4#diff-e36a6cd96b7ef43422dfb1197627e7f8

This commit reverts my part of the change, so tests pass again.
  • Loading branch information
ditman authored Mar 20, 2020
1 parent bd9bcd4 commit d0318c1
Showing 1 changed file with 2 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1018,6 +1018,7 @@ void main() {
'app': app.name,
'path': 'bar',
'isCollectionGroup': true,
'source': 'default',
'parameters': <String, dynamic>{
'where': <List<dynamic>>[],
'orderBy': <List<dynamic>>[],
Expand All @@ -1035,6 +1036,7 @@ void main() {
'app': app.name,
'path': 'bar',
'isCollectionGroup': true,
'source': 'default',
'parameters': <String, dynamic>{
'where': <List<dynamic>>[],
'orderBy': <List<dynamic>>[],
Expand Down

0 comments on commit d0318c1

Please sign in to comment.