This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.
Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
10 lines
168 B
YAML
10 lines
168 B
YAML
toc:
|
|
- title: Latest
|
|
path: /distribute/stories/index.html
|
|
|
|
- title: Apps
|
|
path: /distribute/stories/apps.html
|
|
|
|
- title: Games
|
|
path: /distribute/stories/games.html
|