Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kotlin: add typealias keyword #1437

Merged
merged 1 commit into from
Jun 5, 2018
Merged

Conversation

ilaborie
Copy link
Contributor

@ilaborie ilaborie commented Jun 5, 2018

No description provided.

@mAAdhaTTah
Copy link
Member

mAAdhaTTah commented Jun 5, 2018

@Golmote @LeaVerou This looks good to me, and we have no other open PRs for Kotlin, so I think this is good to merge into master w/o conflicts. Agree?

@ilaborie Thank you for the PR! We're in the process of switching to master and closing out old PRs pointing to gh-pages, so I'm trying to be cautious. We appreciate your patience :).

@LeaVerou
Copy link
Member

LeaVerou commented Jun 5, 2018

LGTM. If we haven't yet folded gh-pages into master we can just go ahead and merge this as-is.

@mAAdhaTTah mAAdhaTTah merged commit c8c5207 into PrismJS:master Jun 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants