resolve conflicts

This commit is contained in:
Gambhiro 2017-01-19 18:29:04 +00:00
commit a7666e72d1
2 changed files with 2 additions and 2 deletions

View File

@ -12,7 +12,7 @@ build = "build.rs"
include = ["data"] include = ["data"]
exclude = [ exclude = [
"book-example/*", "book-example/*",
"data/_html-template/_stylus", "data/assets/_html-template/_stylus",
] ]

View File

@ -66,7 +66,7 @@ There are multiple ways to install mdBook.
cargo build cargo build
``` ```
the resulting binary can be found in `mdBook/target/debug/` under the name `mdBook` or `mdBook.exe` The resulting binary can be found in `mdBook/target/debug/` under the name `mdBook` or `mdBook.exe`.