added a line #37
Open
added a line #37
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
|
This pr has conflicts. conflict happens when you are trying edit to same part of the same file differently in two different branches. in this case if you have an old copy of this repo which you've cloned during the CSE : A Survival guide workshop(Glad you've attended that as well). so if you open a pull request with that repo which we've worked on after the workshop to make it ready for this workshop with out fetching the changes we've made. you will get a conflict. you can dm on teams [CB.EN.U4CSE19063] to resolve this or delete your fork and make a new fork and then open a pull request again. Regards |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
not that important ;)