Indent footer tag #21
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
|
Looks good! Looks like there are some merge conflicts - sometimes changes need to be merged manually because Git doesn't know which one takes precedence. There are instructions above in this PR (a link called "Use the command line"). If you don't feel comfortable fixing the merge conflicts on your own, no worries at all - hit me up tomorrow and we'll do it together. |
|
Here is some more information on merge conflicts and how to fix them: https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line/ |
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.
Thanks for the feedback, indent has been added.