Skip to content

[scroll_overlay] Fix merge in tests - #17

Merged
Piinks merged 1 commit into
flutter:masterfrom
gnprice:pr-merge
Feb 17, 2023
Merged

Piinks merged 1 commit into
flutter:masterfrom
gnprice:pr-merge

Conversation

@gnprice

@gnprice gnprice commented Feb 16, 2023

Copy link
Copy Markdown
Member

The merge-conflict resolution in #16 caused a test file to not parse. Flip the order so that the test parses and runs correctly.

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read the Flutter Style Guide recently, and have followed its advice.
  • I signed the CLA.
  • I listed at least one issue that this PR fixes in the description above.
  • I updated/added relevant documentation (doc comments with ///).
  • I added new tests to check the change I am making, or this PR is test-exempt.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@gnprice gnprice mentioned this pull request Feb 16, 2023
6 of 8 tasks

@Piinks Piinks left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤦‍♀️ Ack, Thank you! LGTM

@Piinks
Piinks merged commit 5a6b71a into flutter:master Feb 17, 2023
@gnprice
gnprice deleted the pr-merge branch February 17, 2023 00:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants