From 9da1d44d45339fc06ec60b6a43d271977bf05436 Mon Sep 17 00:00:00 2001
From: Scott Davis <jetviper21@gmail.com>
Date: Mon, 27 Jun 2011 00:59:08 -0400
Subject: [PATCH] merge

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 319f703a..acc0bc9c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    compass (0.11.3.b352e8b)
+    compass (0.11.3.rails.0.642d0b2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)