From: matthewjasper <mjjasper1@gmail.com>
Date: Sat, 22 Apr 2017 16:55:59 +0000 (+0100)
Subject: Resolve merge conflict
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=8a3ea01bcae85a3ed0c90ca5603cd88c469172c3;p=rust.git

Resolve merge conflict
---

8a3ea01bcae85a3ed0c90ca5603cd88c469172c3
diff --cc src/doc/unstable-book/src/SUMMARY.md
index fa8be7bb23f,ee4e568a5ca..1cfb4653023
--- a/src/doc/unstable-book/src/SUMMARY.md
+++ b/src/doc/unstable-book/src/SUMMARY.md
@@@ -71,6 -71,8 +71,7 @@@
      - [prelude_import](language-features/prelude-import.md)
      - [proc_macro](language-features/proc-macro.md)
      - [quote](language-features/quote.md)
 -    - [relaxed_adts](language-features/relaxed-adts.md)
+     - [repr_align](language-features/repr-align.md)
      - [repr_simd](language-features/repr-simd.md)
      - [rustc_attrs](language-features/rustc-attrs.md)
      - [rustc_diagnostic_macros](language-features/rustc-diagnostic-macros.md)
@@@ -224,4 -226,4 +225,3 @@@
      - [windows_net](library-features/windows-net.md)
      - [windows_stdio](library-features/windows-stdio.md)
      - [zero_one](library-features/zero-one.md)
-->>>>>> Add top level sections to the Unstable Book.