StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve merge conflicts of a5f0068 to nyc-dev

Browse Source 
Change-Id: Id0d573566abb989a173349ffaf01390cebd51607
This commit is contained in:
Trevor Johns
2016-04-11 14:36:41 -07:00
parent 758f872836 a5f006873c
commit f719c29ea9
260 changed files with 36791 additions and 8663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/droiddoc/templates-sdk/components/masthead.cs
View File

@@ -252,8 +252,7 @@
<?cs if:android.hasSamples ?>
<li class="dac-nav-item samples">
<a class="dac-nav-link" href="<?cs var:toroot ?>samples/index.html">Samples</a>
</li>
<?cs /if ?>
</li><?cs /if ?>
<li class="dac-nav-item preview">
<a class="dac-nav-link" href="<?cs var:toroot ?>preview/index.html">Preview</a>
</li>