1 files changed, 1 insertions, 5 deletions
diff --git a/bootstrap.css b/bootstrap.css
index eb7b65678..333d6f04c 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,11 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
-<<<<<<< HEAD
- * Date: Thu Dec 22 19:09:49 PST 2011
-=======
- * Date: Wed Dec 21 18:38:56 CST 2011
->>>>>>> 9fb380151d477f1741b7609ade7a9e7fd5450b2c
+ * Date: Sat Dec 24 22:30:43 PST 2011
  */
 html, body {
   margin: 0;