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

Add some more JS keywords #575

Merged
merged 1 commit into from
Jul 1, 2015
Merged

Add some more JS keywords #575

merged 1 commit into from
Jul 1, 2015

Conversation

TimothyGu
Copy link
Contributor

No description provided.

@LeaVerou
Copy link
Member

Looks good to me, but could you please fix the merge conflicts?

@TimothyGu
Copy link
Contributor Author

@LeaVerou, done.

Golmote added a commit that referenced this pull request Jul 1, 2015
@Golmote Golmote merged commit 5458cec into PrismJS:gh-pages Jul 1, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants