Can't merge #56
Open
Can't merge #56
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
added 30 commits
June 8, 2017 15:03
added 29 commits
July 31, 2017 20:33
robkelley15
referenced
this pull request
in indivisiblemn03/indivisiblemn03.github.io
Jan 7, 2018
add back parade img
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.
Here is the info from siteleaf...all I know is the site won't allow me to do anything, I can't even delete info...Here is the info from siteleaf:
_It looks like your template has fallen behind the one you forked from. This problem is fixed in the parent repository already. That line in your repo is here:
https://github.com/indivisible4c/indivisible4c.github.io/blob/master/_layouts/post.html#L114
Which is slightly different from the fixed version here:
https://github.com/IndivisibleTemplate/BasicTemplate/blob/master/_layouts/post.html#L132
You can either open a pull request to merge in all of the changes from the parent repository here:
https://github.com/indivisible4c/indivisible4c.github.io/compare/master...IndivisibleTemplate:master
Or you can just make that one small change of removing the period in front of [1] in your copy, and leave it without the rest of the changes for now._
I removed the period, nothing changed. Today they said create a pull request...hopefully this can be fixed!