682c24e228
This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.
Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
7 lines
113 B
YAML
7 lines
113 B
YAML
toc:
|
|
- title: About the Samples
|
|
path: /samples/index.html
|
|
|
|
- title: What's New
|
|
path: /samples/new/index.html
|