mirror of
https://github.com/phil-opp/blog_os.git
synced 2025-12-16 14:27:49 +00:00
cfe743ad9e
I tried my best to resolve the conflicts manually but some sentences were modified in different ways in the two PRs.
Blog Content
This folder contains the content for the "Writing an OS in Rust" blog.
License
This folder is licensed under a Creative Commons Attribution-NonCommercial 4.0 International License, available in LICENSE-CC-BY-NC or under https://creativecommons.org/licenses/by-nc/4.0/.
All code examples between markdown code blocks denoted by three backticks (```) are additionally licensed under either of
- Apache License, Version 2.0 (LICENSE-APACHE or https://www.apache.org/licenses/LICENSE-2.0)
- MIT license (LICENSE-MIT or https://opensource.org/licenses/MIT)
at your option.
Contribution
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.