From f17fc367f724ef68e287c45c129558fb62fc6b8e Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Mon, 29 Aug 2011 21:26:53 -0700
Subject: le merging conflicts

---
 lib/scaffolding.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/scaffolding.less')

diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 0833e0c83..2bbb1dc6c 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -46,7 +46,7 @@
   .offset6   { .offset(6); }
   .offset7   { .offset(7); }
   .offset8   { .offset(8); }
-  .offset9   { .offset(8); }
+  .offset9   { .offset(9); }
   .offset10  { .offset(10); }
   .offset11  { .offset(11); }
   .offset12  { .offset(12); }
-- 
cgit v1.2.3