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

Author: bors

Cargo.toml

@@ -4,7 +4,7 @@ version = "0.27.0"
 authors = ["Yehuda Katz <wycats@gmail.com>",
            "Carl Lerche <me@carllerche.com>",
            "Alex Crichton <alex@alexcrichton.com>"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 homepage = "https://crates.io"
 repository = "https://github.com/rust-lang/cargo"
 documentation = "https://docs.rs/cargo"
@@ -91,4 +91,4 @@ doc = false
 
 [[test]]
 name = "testsuite"
-path = "tests/testsuite/lib.rs"
+path = "tests/testsuite/lib.rs"