diff options
| author | 2016-08-04 00:56:39 +0000 | |
|---|---|---|
| committer | 2016-08-04 00:56:39 +0000 | |
| commit | 11d8a4c49e3e1f228302b91f612529b545bba56f (patch) | |
| tree | 58b5d01b4c6df9b266e6590035841f3dabe98fc2 | |
| parent | 1584d5d6e262f2826bb59c9ca92691a3af09a41e (diff) | |
| parent | 473738d6d356b676af2b128f7d6d92105b9358ff (diff) | |
resolve merge conflicts of b29a938c to nyc-dev
am: 473738d6d3
Change-Id: I49bf89f5ed1696ec85c6b15559a97df2a9bcae04
| -rw-r--r-- | docs/html/topic/arc/_book.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/topic/arc/_book.yaml b/docs/html/topic/arc/_book.yaml index 236375b2313f..42287a7c8587 100644 --- 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
\ No newline at end of file + path: /topic/arc/device-support.html |