goddamn gem conflicts

revily · May 2, 2013 · 26a5f46 · 26a5f46
1 parent 1178522
commit 26a5f46
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -339,7 +339,7 @@ GEM
       rack (~> 1.4)
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
-    slim (1.3.7)
+    slim (1.3.8)
       temple (~> 0.6.3)
       tilt (~> 1.3.3)
     slop (3.4.4)
@@ -368,7 +368,7 @@ GEM
       railties (>= 3.0.0)
     tabletastic (0.2.3)
       activesupport (~> 3.0)
-    temple (0.6.3)
+    temple (0.6.4)
     thor (0.18.1)
     tilt (1.3.7)
     timecop (0.6.1)