diff options
| author | Mark Otto <[email protected]> | 2011-09-16 09:47:36 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-09-16 09:47:36 -0700 |
| commit | 8ff18a9ffc9171977e58ecb517cad677ba1727b6 (patch) | |
| tree | 4b9149269be92fdc07e373eb5216068ae5df7ce6 /examples | |
| parent | b188c0da8b51cd18d6fa3fa958e823a318ba5f10 (diff) | |
| parent | d1b594db7a7307efd7de29a2875046166c69a76f (diff) | |
| download | bootstrap-8ff18a9ffc9171977e58ecb517cad677ba1727b6.tar.xz bootstrap-8ff18a9ffc9171977e58ecb517cad677ba1727b6.zip | |
fixing conflict and recompiling
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/container-app.html | 2 | ||||
| -rw-r--r-- | examples/fluid.html | 2 | ||||
| -rw-r--r-- | examples/hero.html | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/container-app.html b/examples/container-app.html index 20ab13789..6432ecf0d 100644 --- a/examples/container-app.html +++ b/examples/container-app.html @@ -12,7 +12,7 @@ <![endif]--> <!-- Le styles --> - <link href="../bootstrap-1.3.0.css" rel="stylesheet"> + <link href="../bootstrap.css" rel="stylesheet"> <style type="text/css"> /* Override some defaults */ html, body { diff --git a/examples/fluid.html b/examples/fluid.html index ab4bb4367..bef16804b 100644 --- a/examples/fluid.html +++ b/examples/fluid.html @@ -12,7 +12,7 @@ <![endif]--> <!-- Le styles --> - <link href="../bootstrap-1.3.0.css" rel="stylesheet"> + <link href="../bootstrap.css" rel="stylesheet"> <style type="text/css"> body { padding-top: 60px; diff --git a/examples/hero.html b/examples/hero.html index a2e5e53e4..fab3d688b 100644 --- a/examples/hero.html +++ b/examples/hero.html @@ -12,7 +12,7 @@ <![endif]--> <!-- Le styles --> - <link href="../bootstrap-1.3.0.css" rel="stylesheet"> + <link href="../bootstrap.css" rel="stylesheet"> <style type="text/css"> body { padding-top: 60px; |