diff options
| author | Mark Otto <[email protected]> | 2013-08-17 17:31:58 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-17 17:31:58 -0700 |
| commit | ba20e512ce53e7cc771ba06d492a01d48db6cc97 (patch) | |
| tree | 30cebcbb796725c7dc06c9125714d83adbf585c3 /_includes/nav-javascript.html | |
| parent | 2af9cf10ce2e93fe0ac07651d405abc484e4c608 (diff) | |
| parent | e29c23afab2577e05cfaa41f64a20f1ca87222fc (diff) | |
| download | bootstrap-ba20e512ce53e7cc771ba06d492a01d48db6cc97.tar.xz bootstrap-ba20e512ce53e7cc771ba06d492a01d48db6cc97.zip | |
Merge branch '3.0.0-wip' into bs3_theme
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to '_includes/nav-javascript.html')
| -rw-r--r-- | _includes/nav-javascript.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/_includes/nav-javascript.html b/_includes/nav-javascript.html index 365fe1a10..e97027096 100644 --- a/_includes/nav-javascript.html +++ b/_includes/nav-javascript.html @@ -4,7 +4,7 @@ <li><a href="#js-individual-compiled">Individual or compiled</a></li> <li><a href="#js-data-attrs">Data attributes</a></li> <li><a href="#js-programmatic-api">Programmatic API</a></li> - <li><a href="#js-noconflict">No Conflict</a></li> + <li><a href="#js-noconflict">No conflict</a></li> <li><a href="#js-events">Events</a></li> </ul> </li> |