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/components.html | 110 ++++++++++++--------------------------------------- 1 file changed, 25 insertions(+), 85 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index ee14526e5..4a1e4fc6f 100644 --- a/docs/components.html +++ b/docs/components.html @@ -27,82 +27,30 @@ -
Bootstrap
@@ -111,33 +59,24 @@
-<<<<<<< HEAD - -
-

Components

-

Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.

-
-======= - -
-

Components

-

Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.

- -
+ +
+

Components

+

Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.

+ +
->>>>>>> a074087034716804610637a5ad9cc0447a2cccb2