From b4b1ef68398b68dcdfa29465d06cd76d6bf2c49d Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 23 Jan 2012 15:17:32 -0800 Subject: rebuild with new templates --- docs/scaffolding.html | 93 +++++---------------------------------------------- 1 file changed, 8 insertions(+), 85 deletions(-) (limited to 'docs/scaffolding.html') diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 904d53af6..be49f94d5 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -27,97 +27,30 @@ -
Bootstrap
@@ -126,15 +59,6 @@
-<<<<<<< HEAD - - -
-

Scaffolding

-

Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.

-
-=======
@@ -146,7 +70,6 @@
  • Responsive design
    • ->>>>>>> a074087034716804610637a5ad9cc0447a2cccb2 @@ -451,7 +374,7 @@
    -