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.

Sign up for GitHub

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

Jump to bottom

Merge tokenizer API to master branch #284

Merged
merged 8 commits into from
Jan 2, 2020
Merged

Merge tokenizer API to master branch #284

merged 8 commits into from
Jan 2, 2020

Conversation

Borewit
Copy link
Collaborator

@Borewit Borewit commented Jan 1, 2020 •
edited

Fix merge conflicts

@Borewit
Copy link
Collaborator Author

Borewit commented Jan 1, 2020

@Borewit
Copy link
Collaborator Author

Borewit commented Jan 1, 2020 •
edited

If you prefer, I adjusted this PR so that it will merge in 2 steps:

  1. this branch to stream-tokenizer
  2. stream-tokenizer to master: Stream tokenizer #285

@Borewit Borewit changed the base branch from master to stream-tokenizer January 2, 2020 10:31
@Borewit Borewit mentioned this pull request Jan 2, 2020
Closed
@sindresorhus sindresorhus merged commit 0a945ee into sindresorhus:stream-tokenizer Jan 2, 2020
@Borewit Borewit deleted the tokenizer/master-merge branch January 2, 2020 11:33
@sindresorhus
Copy link
Owner

And happy new year to you too 🎆

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Borewit @sindresorhus @armand1m