Skip to content
This repository was archived by the owner on Nov 2, 2023. It is now read-only.

Conversation

pritambaral
Copy link

No description provided.

@handrews
Copy link
Contributor

@pritambaral Because things here were kind of on hold for the summer (I apologize for the month delay in responding to this) and a lot of PRs stacked up, this now has some weird conflicts. It's probably easier to just re-do and re-submit. If you have time to do so that would be great, otherwise I'll come back to this and sort it out in a week or so.

handrews added a commit to handrews/json-schema-org.github.io that referenced this pull request Sep 2, 2017
@pritambaral submitted this info just before the Markdown rewrite
and the conflicts were too substantial for me to resolve in that
PR (as far as I can tell, you can only resolve conflicts within
a file in GitHub, and the whole thing moved to a different file).

So here it is, re-submitted for the current format.
@handrews
Copy link
Contributor

handrews commented Sep 2, 2017

I can't resolve the conflicts in GitHub's interface so I just re-submitted this as PR #152. I'm closing this PR in favor of that one.

@handrews handrews closed this Sep 2, 2017
handrews added a commit that referenced this pull request Sep 19, 2017
@pritambaral submitted this info just before the Markdown rewrite
and the conflicts were too substantial for me to resolve in that
PR (as far as I can tell, you can only resolve conflicts within
a file in GitHub, and the whole thing moved to a different file).

So here it is, re-submitted for the current format.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants