resolve merge conflicts of b29a938c to nyc-dev

Change-Id: I840d069b8ffab03b0a7c1fc73ba7eae485c80abb
2016-08-03 17:18:15 -07:00
parent 7eb9f10fec b29a938c1e
commit 473738d6d3
1 changed files with 1 additions and 1 deletions
--- a/docs/html/topic/arc/_book.yaml
+++ b/docs/html/topic/arc/_book.yaml
@@ -6,4 +6,4 @@ toc:
 - title: Loading Apps on Chromebooks
  path: /topic/arc/sideload.html
 - title: Chrome OS Device Support for Apps
-  path: /topic/arc/device-support.html
+  path: /topic/arc/device-support.html