resolve conflicts

2017-01-19 18:29:04 +00:00 · 2017-01-19 18:29:04 +00:00 · a7666e72d1
parent c2ff0c6b15 82faec6b5a
commit a7666e72d1
2 changed files with 2 additions and 2 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@ -12,7 +12,7 @@ build = "build.rs"
 include = ["data"]
 exclude = [
    "book-example/*",
-    "data/_html-template/_stylus",
+    "data/assets/_html-template/_stylus",
 ]


--- a/README.md
+++ b/README.md
@ -66,7 +66,7 @@ There are multiple ways to install mdBook.
   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`.