Skip to content

Separate licenses with OR instead of / #512

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

Merged
merged 1 commit into from
May 23, 2020

Conversation

taiki-e
Copy link
Member

@taiki-e taiki-e commented May 23, 2020

/ is deprecated.

Refs: rust-lang/cargo#4898

Closes #419

@taiki-e

This comment has been minimized.

@jeehoonkang
Copy link
Contributor

Thanks!

bors r+

@bors
Copy link
Contributor

bors bot commented May 23, 2020

Merge conflict.

@taiki-e
Copy link
Member Author

taiki-e commented May 23, 2020

bors r=jeehoonkang

Rebased.

bors bot added a commit that referenced this pull request May 23, 2020
512: Separate licenses with `OR` instead of `/` r=jeehoonkang a=taiki-e

`/` is deprecated. 

Refs: rust-lang/cargo#4898

Closes #419

Co-authored-by: Taiki Endo <[email protected]>
@bors
Copy link
Contributor

bors bot commented May 23, 2020

Build failed:

@taiki-e
Copy link
Member Author

taiki-e commented May 23, 2020

bors retry

bors bot added a commit that referenced this pull request May 23, 2020
512: Separate licenses with `OR` instead of `/` r=jeehoonkang a=taiki-e

`/` is deprecated. 

Refs: rust-lang/cargo#4898

Closes #419

Co-authored-by: Taiki Endo <[email protected]>
@bors
Copy link
Contributor

bors bot commented May 23, 2020

Build failed:

@jeehoonkang
Copy link
Contributor

This PR must not be the reason of the CI failure. I reported the CI failure at #514, and I'm merging it manually...

@jeehoonkang jeehoonkang merged commit 9d57966 into crossbeam-rs:master May 23, 2020
@taiki-e taiki-e deleted the license branch May 23, 2020 22:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

Invalid license identifiers
2 participants