diff options
| author | Scott Main <smain@google.com> | 2009-10-22 14:29:35 -0700 |
|---|---|---|
| committer | Scott Main <smain@google.com> | 2009-10-22 14:29:35 -0700 |
| commit | 3f3b61bd97f6fffdfa103b80acf0c3a123a79e39 (patch) | |
| tree | cf711cec1154c3aaee7dd2705d0ca528bbcd3a1f /docs/html/guide/guide_toc.cs | |
| parent | 40d787ccce7bc4773cdaf115cef78ca85911c292 (diff) | |
| parent | 618ae454947b597e107d9f24c1a83489275803bd (diff) | |
resolved conflicts for merge of 618ae454 to master
Diffstat (limited to 'docs/html/guide/guide_toc.cs')
| -rw-r--r-- | docs/html/guide/guide_toc.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index 604582694523..201890de5997 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -98,7 +98,7 @@ </li> <li class="toggle-list"> <div><a href="<?cs var:toroot ?>guide/topics/resources/index.html"> - <span class="en">Resources and Assests</span> + <span class="en">Resources and Assets</span> </a></div> <ul> <li><a href="<?cs var:toroot ?>guide/topics/resources/resources-i18n.html"> |