Skip to content

Commit

Permalink
licence
Browse files Browse the repository at this point in the history
  • Loading branch information
scott223 committed Nov 20, 2023
1 parent 4d7d91f commit 3b7c900
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 213 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.2.0"
edition = "2021"
authors = ["Scott Brugmans <[email protected]>"]
repository = "https://github.com/scott223/raytracer/"
license = "MIT OR Apache-2.0"
license = "MIT"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
201 changes: 0 additions & 201 deletions LICENSE-APACHE

This file was deleted.

13 changes: 2 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,8 @@ Simple Raytracer for simple 3D scenes, made in Rust. Objective is to learn Rust,

## License

Licensed under either of

* Apache License, Version 2.0
([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
* MIT license
([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)

at your option.
Licensed under MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)

## Contribution

Unless you explicitly state otherwise, any contribution intentionally submitted
for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
dual licensed as above, without any additional terms or conditions.
Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you shall be licensed as above, without any additional terms or conditions.

0 comments on commit 3b7c900

Please sign in to comment.