Skip to content

Commit

Permalink
Merge #219
Browse files Browse the repository at this point in the history
219: change the license format r=Dylan-DPC a=kinggoesgaming

**I'm submitting a ...**
  - [ ] bug fix
  - [ ] feature enhancement
  - [ ] deprecation or removal
  - [ ] refactor

# Description
Changed license field from `MIT/Apache-2.0` to `Apache-2.0 OR MIT`

# Motivation
rust-lang/cargo#4898 deprecated the `/` syntax for licenses, instead opting for `AND` and `OR` keywords.

# Tests
N/A

# Related Issue(s)
rust-lang/cargo#4898


Co-authored-by: Hunar Roop Kahlon <hunar.roop@gmail.com>
Co-authored-by: Dylan DPC <dylan.dpc@gmail.com>
  • Loading branch information
3 people committed May 5, 2018
2 parents eb091dd + b3e1588 commit f7b7195
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = [
"Dylan DPC<dylan.dpc@gmail.com>",
"Hunar Roop Kahlon<hunar.roop@gmail.com>"
]
license = "MIT/Apache-2.0"
license = "Apache-2.0 OR MIT"
readme = "README.md"
repository = "https://github.com/uuid-rs/uuid"
homepage = "https://github.com/uuid-rs/uuid"
Expand Down

0 comments on commit f7b7195

Please sign in to comment.