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

updated ajv description #89

Merged
merged 2 commits into from
Mar 26, 2017
Merged

updated ajv description #89

merged 2 commits into from
Mar 26, 2017

Conversation

epoberezkin
Copy link
Member

No description provided.

@handrews
Copy link
Contributor

@epoberezkin I tried to resolve the conflicts with the other PR in this area that was just submitted but it apparently didn't work so you'll need to fix it. Sorry about that :-/

@epoberezkin
Copy link
Member Author

@handrews all looks good it seems.

@handrews handrews merged commit 255f692 into json-schema-org:master Mar 26, 2017
@handrews
Copy link
Contributor

@epoberezkin I figured it out- it won't let me resolve-and-rebase, but it will let me resolve-and-merge with a merge commit.

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