Skip to content

Commit 8830eca

Browse files
committed
Auto merge of #5080 - matklad:hope-this-wont-be-re-reverted, r=alexcrichton
Revert "Seperate licenses with a `/`" This reverts commit 1ddba76. OR is the more modern form 🤣 r? @alexcrichton
2 parents 62f05f4 + e3eb286 commit 8830eca

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.27.0"
44
authors = ["Yehuda Katz <[email protected]>",
55
"Carl Lerche <[email protected]>",
66
"Alex Crichton <[email protected]>"]
7-
license = "MIT/Apache-2.0"
7+
license = "MIT OR Apache-2.0"
88
homepage = "https://crates.io"
99
repository = "https://github.com/rust-lang/cargo"
1010
documentation = "https://docs.rs/cargo"
@@ -91,4 +91,4 @@ doc = false
9191

9292
[[test]]
9393
name = "testsuite"
94-
path = "tests/testsuite/lib.rs"
94+
path = "tests/testsuite/lib.rs"

0 commit comments

Comments
 (0)