Fixed Issue 160 #168
Closed
Fixed Issue 160 #168
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
|
Hey, @SapinderSingh Please resolve the merge conflicts. |
|
@arteevraina can you guide me ? |
What should I do to resolve merge conflicts? |
Check out your feature branch and pull the latest changes from upstream. Then your code editor will give you suggestion, whether you want to keep your change or accept incoming change. This way proceed step by step and then test the app before pushing your code. If this works then you are good to go :) |
|
Still if you get stuck just ping here or on the channel. I will try to help. |
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.
Renamed all the files according to Dart Preferences and guidelines. Also fixed the imports as suggested.