From 9f82e804bfc4dc64d141f90d5b2623f27af2f169 Mon Sep 17 00:00:00 2001
From: Metamaps on Linode <contact@culturecraft.cc>
Date: Sun, 17 Mar 2013 10:48:46 -0400
Subject: [PATCH] removed windows-generated Gemfile.lock

---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index cb1ac1c2..2075b0ef 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,7 @@ gem 'rb-readline'
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails',   '~> 3.2.3'
+  gem 'sass-rails',   '3.2.3'
   gem 'coffee-rails', '~> 3.2.1'
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
diff --git a/Gemfile.lock b/Gemfile.lock
index ed4f0c01..2b12a39e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -99,9 +99,9 @@ GEM
     rdoc (3.12)
       json (~> 1.4)
     ref (1.0.2)
-    sass (3.2.1)
-    sass-rails (3.2.5)
-      railties (~> 3.2.0)
+    sass (3.2.7)
+    sass-rails (3.2.3)
+      railties (~> 3.2.0.beta)
       sass (>= 3.1.10)
       tilt (~> 1.3)
     sprockets (2.2.2)
@@ -140,6 +140,6 @@ DEPENDENCIES
   rails (= 3.2.11)
   rails3-jquery-autocomplete
   rb-readline
-  sass-rails (~> 3.2.3)
+  sass-rails (= 3.2.3)
   therubyracer
   uglifier (>= 1.0.3)