From dcc312ac215b57afc648725bb8d64ff287bf7798 Mon Sep 17 00:00:00 2001
From: Seb Bacon <seb.bacon@gmail.com>
Date: Wed, 15 Feb 2012 10:02:30 +0000
Subject: Merge jpmckinney/bundler

---
 vendor/gems/json-1.5.1/lib/json.rb | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 vendor/gems/json-1.5.1/lib/json.rb

(limited to 'vendor/gems/json-1.5.1/lib/json.rb')

diff --git a/vendor/gems/json-1.5.1/lib/json.rb b/vendor/gems/json-1.5.1/lib/json.rb
deleted file mode 100644
index 789b0de54..000000000
--- a/vendor/gems/json-1.5.1/lib/json.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'json/common'
-module JSON
-  require 'json/version'
-
-  begin
-    require 'json/ext'
-  rescue LoadError
-    require 'json/pure'
-  end
-end
-- 
cgit v1.2.3