Fixed merge conflicts #47
Merged
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
|
Visit the preview URL for this PR (updated for commit 99589d1): https://tcl-55-smart-shopping-list--pr47-yj-ky-list-item-chak-1yjjs4zx.web.app (expires Mon, 05 Jun 2023 00:11:02 GMT) 🔥 via Firebase Hosting GitHub Action 🌎 Sign: 607d14028385ebfcc7c9ec69a7bb14d95ed54078 |
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.
For an example of how to fill this template out, see this Pull Request.
Description
Related Issue
Acceptance Criteria
Type of Changes
Updates
Before
After
Testing Steps / QA Criteria